zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove UpdateSsrcs from EncoderStateFeedback.

Browse Source 
Removes ability to modify set SSRCs from EncoderStateFeedback after
construction.

BUG=webrtc:1695
R=sprang@webrtc.org
TBR=stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1241123002

Cr-Commit-Position: refs/heads/master@{#9603}
This commit is contained in:
pbos
2015-07-20 08:01:17 -07:00
committed by Commit bot
parent 324d9c9a86
commit 8ff04d6b3b
7 changed files with 27 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
webrtc/video_engine/encoder_state_feedback.cc
View File

@ -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();