| Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc
|
| diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc
|
| index 6d6c48fadafdddffef3ee6a3893387bc4338d477..45c4b6357f87ab835a7bbdb7cb0b45437290d0f7 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc
|
| @@ -45,7 +45,7 @@ bool Dlrr::Parse(const uint8_t* buffer, uint16_t block_length_32bits) {
|
| size_t blocks_count = block_length_32bits / 3;
|
| const uint8_t* read_at = buffer + kBlockHeaderLength;
|
| sub_blocks_.resize(blocks_count);
|
| - for (SubBlock& sub_block : sub_blocks_) {
|
| + for (ReceiveTimeInfo& sub_block : sub_blocks_) {
|
| sub_block.ssrc = ByteReader<uint32_t>::ReadBigEndian(&read_at[0]);
|
| sub_block.last_rr = ByteReader<uint32_t>::ReadBigEndian(&read_at[4]);
|
| sub_block.delay_since_last_rr =
|
| @@ -71,7 +71,7 @@ void Dlrr::Create(uint8_t* buffer) const {
|
| ByteWriter<uint16_t>::WriteBigEndian(&buffer[2], 3 * sub_blocks_.size());
|
| // Create sub blocks.
|
| uint8_t* write_at = buffer + kBlockHeaderLength;
|
| - for (const SubBlock& sub_block : sub_blocks_) {
|
| + for (const ReceiveTimeInfo& sub_block : sub_blocks_) {
|
| ByteWriter<uint32_t>::WriteBigEndian(&write_at[0], sub_block.ssrc);
|
| ByteWriter<uint32_t>::WriteBigEndian(&write_at[4], sub_block.last_rr);
|
| ByteWriter<uint32_t>::WriteBigEndian(&write_at[8],
|
| @@ -81,20 +81,23 @@ void Dlrr::Create(uint8_t* buffer) const {
|
| RTC_DCHECK_EQ(buffer + BlockLength(), write_at);
|
| }
|
|
|
| -bool Dlrr::WithDlrrItem(uint32_t ssrc,
|
| - uint32_t last_rr,
|
| - uint32_t delay_last_rr) {
|
| +bool Dlrr::WithDlrrItem(const ReceiveTimeInfo& block) {
|
| if (sub_blocks_.size() >= kMaxNumberOfDlrrItems) {
|
| LOG(LS_WARNING) << "Max DLRR items reached.";
|
| return false;
|
| }
|
| - SubBlock block;
|
| - block.ssrc = ssrc;
|
| - block.last_rr = last_rr;
|
| - block.delay_since_last_rr = delay_last_rr;
|
| sub_blocks_.push_back(block);
|
| return true;
|
| }
|
|
|
| +bool Dlrr::WithDlrrItem(uint32_t ssrc,
|
| + uint32_t last_rr,
|
| + uint32_t delay_last_rr) {
|
| + ReceiveTimeInfo block;
|
| + block.ssrc = ssrc;
|
| + block.last_rr = last_rr;
|
| + block.delay_since_last_rr = delay_last_rr;
|
| + return WithDlrrItem(block);
|
| +}
|
| } // namespace rtcp
|
| } // namespace webrtc
|
|
|