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

rtcp::TmmbItem designed to replace RTCPUtility::RTCPPacketRTPFBTMMBRItem (for creating and parsing rtcp TMMBR/TMMBN packets)

Browse Source 
std::vector<rtcp::TmmbItem> will replace TMMBRSet class for storage, processing and preparing TMBBR/TMMBN
(i.e. this TmmbItem replaces Timber structure introduced in https://codereview.webrtc.org/1474693002 )
Previous structures store bitrate in kbps. TmmbItem use bps removing need to regularly divide and multiply by 1000.

BUG=webrtc:5260
R=åsapersson

Review URL: https://codereview.webrtc.org/1576223003

Cr-Commit-Position: refs/heads/master@{#11491}
This commit is contained in:
danilchap 2016-02-04 07:33:39 -08:00 committed by Commit bot
parent 20834ca806
commit a92d6be411
4 changed files with 117 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/rtp_rtcp/BUILD.gn
View File

@ -84,6 +84,8 @@ source_set("rtp_rtcp") {
"source/rtcp_packet/sender_report.h",
"source/rtcp_packet/sli.cc",
"source/rtcp_packet/sli.h",
"source/rtcp_packet/tmmb_item.cc",
"source/rtcp_packet/tmmb_item.h",
"source/rtcp_packet/tmmbn.cc",
"source/rtcp_packet/tmmbn.h",
"source/rtcp_packet/tmmbr.cc",

2
webrtc/modules/rtp_rtcp/rtp_rtcp.gypi
View File

@ -79,6 +79,8 @@
'source/rtcp_packet/sender_report.h',
'source/rtcp_packet/sli.cc',
'source/rtcp_packet/sli.h',
'source/rtcp_packet/tmmb_item.cc',
'source/rtcp_packet/tmmb_item.h',
'source/rtcp_packet/tmmbn.cc',
'source/rtcp_packet/tmmbn.h',
'source/rtcp_packet/tmmbr.cc',

62
webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc Normal file
View File

@ -0,0 +1,62 @@
/*
* Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h"
#include "webrtc/base/checks.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)
: ssrc_(ssrc), bitrate_bps_(bitrate_bps), packet_overhead_(overhead) {
RTC_DCHECK_LE(overhead, 0x1ffu);
}
// 0 1 2 3
// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// 0 | SSRC |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// 4 | MxTBR Exp | MxTBR Mantissa |Measured Overhead|
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
void 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.
uint16_t overhead = compact & 0x1ff; // 9 bits.
// Combine 3 components into 2 values.
bitrate_bps_ = (mantissa << exponent);
packet_overhead_ = overhead;
}
void TmmbItem::Create(uint8_t* buffer) const {
const uint32_t kMaxMantissa = 0x1ffff; // 17 bits.
uint32_t mantissa = bitrate_bps_;
uint32_t exponent = 0;
while (mantissa > kMaxMantissa) {
mantissa >>= 1;
++exponent;
}
ByteWriter<uint32_t>::WriteBigEndian(&buffer[0], ssrc_);
uint32_t compact = (exponent << 26) | (mantissa << 9) | packet_overhead_;
ByteWriter<uint32_t>::WriteBigEndian(&buffer[4], compact);
}
void TmmbItem::set_packet_overhead(uint16_t overhead) {
RTC_DCHECK_LE(overhead, 0x1ffu);
packet_overhead_ = overhead;
}
} // namespace rtcp
} // namespace webrtc

51
webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h Normal file
View File

@ -0,0 +1,51 @@
/*
* Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMB_ITEM_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMB_ITEM_H_
#include "webrtc/base/basictypes.h"
namespace webrtc {
namespace rtcp {
// RFC5104, Section 3.5.4
// Temporary Maximum Media Stream Bitrate Request/Notification.
// Used both by TMMBR and TMMBN rtcp packets.
class TmmbItem {
public:
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);
void 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_packet_overhead(uint16_t overhead);
uint32_t ssrc() const { return ssrc_; }
uint32_t bitrate_bps() const { return bitrate_bps_; }
uint16_t packet_overhead() const { return packet_overhead_; }
private:
// Media stream id.
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_;
// Per-packet overhead that the media receiver has observed
// for this media stream at its chosen reference protocol layer.
uint16_t packet_overhead_;
};
} // namespace rtcp
} // namespace webrtc
#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMB_ITEM_H_