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

Unified Diff: webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.cc

Issue 2370313002: Reland of Unify rtcp packet setters (Closed)
Patch Set: Fix breaking mistype Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.cc
index 2f59fbbd55f3d387f8e89f85248065d6697fed83..ac5fc1a68fe1bf7e8abff5c8fcf072b1dffa0d68 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.cc
@@ -10,6 +10,8 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h"
+#include <utility>
+
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
@@ -81,22 +83,12 @@ bool Remb::Parse(const CommonHeader& packet) {
return true;
}
-bool Remb::AppliesTo(uint32_t ssrc) {
- if (ssrcs_.size() >= kMaxNumberOfSsrcs) {
- LOG(LS_WARNING) << "Max number of REMB feedback SSRCs reached.";
- return false;
- }
- ssrcs_.push_back(ssrc);
- return true;
-}
-
-bool Remb::AppliesToMany(const std::vector<uint32_t>& ssrcs) {
- if (ssrcs_.size() + ssrcs.size() > kMaxNumberOfSsrcs) {
+bool Remb::SetSsrcs(std::vector<uint32_t> ssrcs) {
+ if (ssrcs.size() > kMaxNumberOfSsrcs) {
LOG(LS_WARNING) << "Not enough space for all given SSRCs.";
return false;
}
- // Append.
- ssrcs_.insert(ssrcs_.end(), ssrcs.begin(), ssrcs.end());
+ ssrcs_ = std::move(ssrcs);
return true;
}
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h ('k') | webrtc/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698