From 6a1a8ce6688e962709212a31a5b4e97fc500a911 Mon Sep 17 00:00:00 2001 From: danilchap Date: Sat, 21 May 2016 09:54:40 -0700 Subject: [PATCH] [rtcp] in Tmmbn/tmmbr packets bitrate updated to 64bit to match packet format. Review-Url: https://codereview.webrtc.org/1991223002 Cr-Commit-Position: refs/heads/master@{#12837} --- .../rtp_rtcp/source/rtcp_packet/tmmb_item.cc | 19 ++++++++++++++----- .../rtp_rtcp/source/rtcp_packet/tmmb_item.h | 10 +++++----- .../rtp_rtcp/source/rtcp_packet/tmmbn.cc | 3 ++- .../rtp_rtcp/source/rtcp_packet/tmmbr.cc | 3 ++- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc index cd9a16b7dc..b15615267e 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc @@ -11,11 +11,12 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" #include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" namespace webrtc { namespace rtcp { -TmmbItem::TmmbItem(uint32_t ssrc, uint32_t bitrate_bps, uint16_t overhead) +TmmbItem::TmmbItem(uint32_t ssrc, uint64_t bitrate_bps, uint16_t overhead) : ssrc_(ssrc), bitrate_bps_(bitrate_bps), packet_overhead_(overhead) { RTC_DCHECK_LE(overhead, 0x1ffu); } @@ -27,22 +28,30 @@ TmmbItem::TmmbItem(uint32_t ssrc, uint32_t bitrate_bps, uint16_t overhead) // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ // 4 | MxTBR Exp | MxTBR Mantissa |Measured Overhead| // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -void TmmbItem::Parse(const uint8_t* buffer) { +bool TmmbItem::Parse(const uint8_t* buffer) { ssrc_ = ByteReader::ReadBigEndian(&buffer[0]); // Read 4 bytes into 1 block. uint32_t compact = ByteReader::ReadBigEndian(&buffer[4]); // Split 1 block into 3 components. uint8_t exponent = compact >> 26; // 6 bits. - uint32_t mantissa = (compact >> 9) & 0x1ffff; // 17 bits. + uint64_t mantissa = (compact >> 9) & 0x1ffff; // 17 bits. uint16_t overhead = compact & 0x1ff; // 9 bits. // Combine 3 components into 2 values. bitrate_bps_ = (mantissa << exponent); + + bool shift_overflow = (bitrate_bps_ >> exponent) != mantissa; + if (shift_overflow) { + LOG(LS_ERROR) << "Invalid tmmb bitrate value : " << mantissa + << "*2^" << static_cast(exponent); + return false; + } packet_overhead_ = overhead; + return true; } void TmmbItem::Create(uint8_t* buffer) const { - const uint32_t kMaxMantissa = 0x1ffff; // 17 bits. - uint32_t mantissa = bitrate_bps_; + constexpr uint64_t kMaxMantissa = 0x1ffff; // 17 bits. + uint64_t mantissa = bitrate_bps_; uint32_t exponent = 0; while (mantissa > kMaxMantissa) { mantissa >>= 1; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h index d082f2f561..c77bb761dd 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h @@ -23,17 +23,17 @@ class TmmbItem { static const size_t kLength = 8; TmmbItem() : ssrc_(0), bitrate_bps_(0), packet_overhead_(0) {} - TmmbItem(uint32_t ssrc, uint32_t bitrate_bps, uint16_t overhead); + TmmbItem(uint32_t ssrc, uint64_t bitrate_bps, uint16_t overhead); - void Parse(const uint8_t* buffer); + bool Parse(const uint8_t* buffer); void Create(uint8_t* buffer) const; void set_ssrc(uint32_t ssrc) { ssrc_ = ssrc; } - void set_bitrate_bps(uint32_t bitrate_bps) { bitrate_bps_ = bitrate_bps; } + void set_bitrate_bps(uint64_t bitrate_bps) { bitrate_bps_ = bitrate_bps; } void set_packet_overhead(uint16_t overhead); uint32_t ssrc() const { return ssrc_; } - uint32_t bitrate_bps() const { return bitrate_bps_; } + uint64_t bitrate_bps() const { return bitrate_bps_; } uint16_t packet_overhead() const { return packet_overhead_; } private: @@ -41,7 +41,7 @@ class TmmbItem { uint32_t ssrc_; // Maximum total media bit rate that the media receiver is // currently prepared to accept for this media stream. - uint32_t bitrate_bps_; + uint64_t bitrate_bps_; // Per-packet overhead that the media receiver has observed // for this media stream at its chosen reference protocol layer. uint16_t packet_overhead_; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc index ec3b428039..730b40865d 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc @@ -63,7 +63,8 @@ bool Tmmbn::Parse(const RtcpCommonHeader& header, const uint8_t* payload) { size_t number_of_items = items_size_bytes / TmmbItem::kLength; items_.resize(number_of_items); for (TmmbItem& item : items_) { - item.Parse(next_item); + if (!item.Parse(next_item)) + return false; next_item += TmmbItem::kLength; } return true; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc index b19fa08b3b..b24b039b40 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc @@ -64,7 +64,8 @@ bool Tmmbr::Parse(const RtcpCommonHeader& header, const uint8_t* payload) { size_t number_of_items = items_size_bytes / TmmbItem::kLength; items_.resize(number_of_items); for (TmmbItem& item : items_) { - item.Parse(next_item); + if (!item.Parse(next_item)) + return false; next_item += TmmbItem::kLength; } return true;