diff options
| author | Dario Lombardo <lomato@gmail.com> | 2020-03-17 08:44:28 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-03-17 10:19:10 +0000 |
| commit | fbca66fc8df04ee680706073b8b4b16b4736bd89 (patch) | |
| tree | 3458bf6de8b0f54045f7926c1a5948677e78cb56 | |
| parent | 4a8da5fbde2b731aeba451735497b46361873282 (diff) | |
rtcp: extend mantissa and bitrate to 64 bit.
This is required to allow the maximum valid exponent (63) to
be used.
Bug: 16445
Change-Id: I1473cebbe74a59785f03a882e3bc1af4b881d444
Reviewed-on: https://code.wireshark.org/review/36451
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-rtcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index a6dde64a19..6d07153f1e 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -1190,7 +1190,7 @@ dissect_rtcp_psfb_remb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, proto_ { guint exp, indexSsrcs; guint8 numberSsrcs; - guint32 mantissa, bitrate; + guint64 mantissa, bitrate; proto_tree *fci_tree; fci_tree = proto_tree_add_subtree_format( rtcp_tree, tvb, offset, 8, ett_ssrc, NULL, "REMB %d", num_fci ); @@ -1213,7 +1213,7 @@ dissect_rtcp_psfb_remb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, proto_ proto_tree_add_item( fci_tree, hf_rtcp_psfb_remb_fci_mantissa, tvb, offset, 3, ENC_BIG_ENDIAN ); mantissa = (tvb_get_ntohl( tvb, offset - 1) & 0x0003ffff); bitrate = mantissa << exp; - proto_tree_add_string_format_value( fci_tree, hf_rtcp_psfb_remb_fci_bitrate, tvb, offset, 3, "", "%u", bitrate); + proto_tree_add_string_format_value( fci_tree, hf_rtcp_psfb_remb_fci_bitrate, tvb, offset, 3, "", "%" G_GINT64_MODIFIER "u", bitrate); offset += 3; for (indexSsrcs = 0; indexSsrcs < numberSsrcs; indexSsrcs++) @@ -1224,7 +1224,7 @@ dissect_rtcp_psfb_remb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, proto_ } if (top_item != NULL) { - proto_item_append_text(top_item, ": REMB: max bitrate=%u", bitrate); + proto_item_append_text(top_item, ": REMB: max bitrate=%" G_GINT64_MODIFIER "u", bitrate); } *read_fci = 2 + (numberSsrcs); |