admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[rtcp] in Tmmbn/tmmbr packets bitrate updated to 64bit

Browse Source 
to match packet format.

Review-Url: https://codereview.webrtc.org/1991223002
Cr-Commit-Position: refs/heads/master@{#12837}
This commit is contained in:
danilchap 2016-05-21 09:54:40 -07:00 committed by Commit bot
parent 1abfc2a7f3
commit 6a1a8ce668
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc
View File

@ -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<uint32_t>::ReadBigEndian(&buffer[0]);
// Read 4 bytes into 1 block.
uint32_t compact = ByteReader<uint32_t>::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<int>(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;

10
webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h
View File

@ -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_;

3
webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc
View File

@ -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;

3
webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc
View File

@ -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;