Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.cc

Issue 2991623002: Add SetReportBlocks to rtcp Sender/Receive Report classes. (Closed)
Patch Set: fix typo Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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
11 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" 11 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
12 12
13 #include <utility>
14
13 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" 15 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
14 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" 16 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h"
15 #include "webrtc/rtc_base/checks.h" 17 #include "webrtc/rtc_base/checks.h"
16 #include "webrtc/rtc_base/logging.h" 18 #include "webrtc/rtc_base/logging.h"
17 19
18 namespace webrtc { 20 namespace webrtc {
19 namespace rtcp { 21 namespace rtcp {
20 constexpr uint8_t ReceiverReport::kPacketType; 22 constexpr uint8_t ReceiverReport::kPacketType;
23 constexpr size_t ReceiverReport::kMaxNumberOfReportBlocks;
21 // RTCP receiver report (RFC 3550). 24 // RTCP receiver report (RFC 3550).
22 // 25 //
23 // 0 1 2 3 26 // 0 1 2 3
24 // 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 27 // 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
25 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 28 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
26 // |V=2|P| RC | PT=RR=201 | length | 29 // |V=2|P| RC | PT=RR=201 | length |
27 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 30 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
28 // | SSRC of packet sender | 31 // | SSRC of packet sender |
29 // +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ 32 // +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
30 // | report block(s) | 33 // | report block(s) |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 89
87 bool ReceiverReport::AddReportBlock(const ReportBlock& block) { 90 bool ReceiverReport::AddReportBlock(const ReportBlock& block) {
88 if (report_blocks_.size() >= kMaxNumberOfReportBlocks) { 91 if (report_blocks_.size() >= kMaxNumberOfReportBlocks) {
89 LOG(LS_WARNING) << "Max report blocks reached."; 92 LOG(LS_WARNING) << "Max report blocks reached.";
90 return false; 93 return false;
91 } 94 }
92 report_blocks_.push_back(block); 95 report_blocks_.push_back(block);
93 return true; 96 return true;
94 } 97 }
95 98
99 bool ReceiverReport::SetReportBlocks(std::vector<ReportBlock> blocks) {
100 if (blocks.size() > kMaxNumberOfReportBlocks) {
101 LOG(LS_WARNING) << "Too many report blocks (" << blocks.size()
102 << ") for receiver report.";
103 return false;
104 }
105 report_blocks_ = std::move(blocks);
106 return true;
107 }
108
96 } // namespace rtcp 109 } // namespace rtcp
97 } // namespace webrtc 110 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698