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

Unified Diff: webrtc/video_engine/encoder_state_feedback.cc

Issue 1241123002: Remove UpdateSsrcs from EncoderStateFeedback. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: empty SSRC vector handling Created 5 years, 5 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/video_engine/encoder_state_feedback.cc
diff --git a/webrtc/video_engine/encoder_state_feedback.cc b/webrtc/video_engine/encoder_state_feedback.cc
index 4d9db5847d860431136a51ad07094f646dd1deb0..55a0c4394660876d28c43b0e2d204665c042b311 100644
--- a/webrtc/video_engine/encoder_state_feedback.cc
+++ b/webrtc/video_engine/encoder_state_feedback.cc
@@ -54,34 +54,16 @@ EncoderStateFeedback::~EncoderStateFeedback() {
assert(encoders_.empty());
}
-void EncoderStateFeedback::UpdateSsrcs(const std::vector<uint32_t>& ssrcs,
- ViEEncoder* encoder) {
+void EncoderStateFeedback::AddEncoder(const std::vector<uint32_t>& ssrcs,
+ ViEEncoder* encoder) {
+ DCHECK(!ssrcs.empty());
CriticalSectionScoped lock(crit_.get());
- SsrcEncoderMap::iterator it = encoders_.begin();
- while (it != encoders_.end()) {
- if (it->second == encoder) {
- encoders_.erase(it++);
- } else {
- ++it;
- }
- }
for (uint32_t ssrc : ssrcs) {
DCHECK(encoders_.find(ssrc) == encoders_.end());
encoders_[ssrc] = encoder;
}
}
-bool EncoderStateFeedback::AddEncoder(uint32_t ssrc, ViEEncoder* encoder) {
- CriticalSectionScoped lock(crit_.get());
- if (encoders_.find(ssrc) != encoders_.end()) {
- // Two encoders must not have the same ssrc.
- return false;
- }
-
- encoders_[ssrc] = encoder;
- return true;
-}
-
void EncoderStateFeedback::RemoveEncoder(const ViEEncoder* encoder) {
CriticalSectionScoped lock(crit_.get());
SsrcEncoderMap::iterator it = encoders_.begin();
« no previous file with comments | « webrtc/video_engine/encoder_state_feedback.h ('k') | webrtc/video_engine/encoder_state_feedback_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698