diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2014-05-29 17:51:37 +0200 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2014-05-29 17:30:26 +0000 |
| commit | 91dac2771b9374c61d0d2b45ef08202cb404e59a (patch) | |
| tree | b7b12d479d60fd05fb0c579d8a4393c1ed6e6d56 /epan | |
| parent | 254e227266a37eddd887ba5721a72b9dcf8a900b (diff) | |
| download | wireshark-91dac2771b9374c61d0d2b45ef08202cb404e59a.tar.gz | |
conver sat freq and symbol rate into doubles in order to make the
filtering work, fix typos
Change-Id: I7ed989807826d1322dab00d13d998488caaf73ff
Reviewed-on: https://code.wireshark.org/review/1859
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-mpeg-descriptor.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index e762f744da..4e87c761b6 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -740,14 +740,15 @@ static void proto_mpeg_descriptor_dissect_satellite_delivery(tvbuff_t *tvb, guint offset, proto_tree *tree) { - float frequency, orbital_position, symbol_rate; + double frequency, symbol_rate; + float orbital_position; guint8 modulation_system; - frequency = MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset)) * 10.0f + - MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset+1)) / 10.0f + - MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset+2)) / 1000.0f + - MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset+3)) / 100000.f; - proto_tree_add_float_format_value(tree, hf_mpeg_descr_satellite_delivery_frequency, + frequency = MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset)) * 10.0 + + MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset+1)) / 10.0 + + MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset+2)) / 1000.0 + + MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset+3)) / 100000.0; + proto_tree_add_double_format_value(tree, hf_mpeg_descr_satellite_delivery_frequency, tvb, offset, 4, frequency, "%f GHz", frequency); offset += 4; @@ -769,12 +770,12 @@ proto_mpeg_descriptor_dissect_satellite_delivery(tvbuff_t *tvb, guint offset, pr proto_tree_add_item(tree, hf_mpeg_descr_satellite_delivery_modulation_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - symbol_rate = MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset)) * 10.0f + - MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset+1)) / 10.0f + - MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset+2)) / 1000.0f + + symbol_rate = MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset)) * 10.0 + + MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset+1)) / 10.0 + + MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset+2)) / 1000.0 + /* symbol rate is 28 bits, only the upper 4 bits of this byte are used */ - MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset+3)>>4) / 10000.0f; - proto_tree_add_float_format_value(tree, hf_mpeg_descr_satellite_delivery_symbol_rate, + MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset+3)>>4) / 10000.0; + proto_tree_add_double_format_value(tree, hf_mpeg_descr_satellite_delivery_symbol_rate, tvb, offset, 4, symbol_rate, "%3.4f MSym/s", symbol_rate); offset += 3; @@ -3274,7 +3275,7 @@ proto_register_mpeg_descriptor(void) /* 0x43 Satellite Delivery System Descriptor */ { &hf_mpeg_descr_satellite_delivery_frequency, { "Frequency", "mpeg_descr.sat_delivery.freq", - FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL + FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_mpeg_descr_satellite_delivery_orbital_position, { @@ -3319,7 +3320,7 @@ proto_register_mpeg_descriptor(void) { &hf_mpeg_descr_satellite_delivery_symbol_rate, { "Symbol Rate", "mpeg_descr.sat_delivery.symbol_rate", - FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL + FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_mpeg_descr_satellite_delivery_fec_inner, { |