OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 sender_packet_count_ = ByteReader<uint32_t>::ReadBigEndian(&payload[16]); | 61 sender_packet_count_ = ByteReader<uint32_t>::ReadBigEndian(&payload[16]); |
62 sender_octet_count_ = ByteReader<uint32_t>::ReadBigEndian(&payload[20]); | 62 sender_octet_count_ = ByteReader<uint32_t>::ReadBigEndian(&payload[20]); |
63 report_blocks_.resize(report_block_count); | 63 report_blocks_.resize(report_block_count); |
64 const uint8_t* next_block = payload + kSenderBaseLength; | 64 const uint8_t* next_block = payload + kSenderBaseLength; |
65 for (ReportBlock& block : report_blocks_) { | 65 for (ReportBlock& block : report_blocks_) { |
66 bool block_parsed = block.Parse(next_block, ReportBlock::kLength); | 66 bool block_parsed = block.Parse(next_block, ReportBlock::kLength); |
67 RTC_DCHECK(block_parsed); | 67 RTC_DCHECK(block_parsed); |
68 next_block += ReportBlock::kLength; | 68 next_block += ReportBlock::kLength; |
69 } | 69 } |
70 // Double check we didn't read beyond provided buffer. | 70 // Double check we didn't read beyond provided buffer. |
71 RTC_DCHECK_EQ(next_block - payload, | 71 RTC_DCHECK_LE(next_block - payload, |
72 static_cast<ptrdiff_t>(packet.payload_size_bytes())); | 72 static_cast<ptrdiff_t>(packet.payload_size_bytes())); |
73 return true; | 73 return true; |
74 } | 74 } |
75 | 75 |
76 bool SenderReport::Create(uint8_t* packet, | 76 bool SenderReport::Create(uint8_t* packet, |
77 size_t* index, | 77 size_t* index, |
78 size_t max_length, | 78 size_t max_length, |
79 RtcpPacket::PacketReadyCallback* callback) const { | 79 RtcpPacket::PacketReadyCallback* callback) const { |
80 while (*index + BlockLength() > max_length) { | 80 while (*index + BlockLength() > max_length) { |
81 if (!OnBufferFull(packet, index, callback)) | 81 if (!OnBufferFull(packet, index, callback)) |
(...skipping 27 matching lines...) Expand all Loading... |
109 if (report_blocks_.size() >= kMaxNumberOfReportBlocks) { | 109 if (report_blocks_.size() >= kMaxNumberOfReportBlocks) { |
110 LOG(LS_WARNING) << "Max report blocks reached."; | 110 LOG(LS_WARNING) << "Max report blocks reached."; |
111 return false; | 111 return false; |
112 } | 112 } |
113 report_blocks_.push_back(block); | 113 report_blocks_.push_back(block); |
114 return true; | 114 return true; |
115 } | 115 } |
116 | 116 |
117 } // namespace rtcp | 117 } // namespace rtcp |
118 } // namespace webrtc | 118 } // namespace webrtc |
OLD | NEW |