summaryrefslogtreecommitdiff
path: root/video_engine/vie_channel_manager.cc
diff options
context:
space:
mode:
authormflodman@webrtc.org <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-02-14 11:25:26 +0000
committermflodman@webrtc.org <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-02-14 11:25:26 +0000
commit7e63b04377e4b64ec364a930883243d7032a88df (patch)
tree91e197a97bd36a3de0fa328a66f11aec4d2e17d3 /video_engine/vie_channel_manager.cc
parent00cc4a6771aeff6a0051805d339723f8cf44c1d7 (diff)
downloadwebrtc-7e63b04377e4b64ec364a930883243d7032a88df.tar.gz
Reset ssrc when calling SetSendCodec.
BUG=1398 TEST=Tested locally. Review URL: https://webrtc-codereview.appspot.com/1107004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3511 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_channel_manager.cc')
-rw-r--r--video_engine/vie_channel_manager.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/video_engine/vie_channel_manager.cc b/video_engine/vie_channel_manager.cc
index beda55f4..42ae6564 100644
--- a/video_engine/vie_channel_manager.cc
+++ b/video_engine/vie_channel_manager.cc
@@ -403,6 +403,9 @@ void ViEChannelManager::UpdateSsrcs(int channel_id,
EncoderStateFeedback* encoder_state_feedback =
channel_group->GetEncoderStateFeedback();
+ // Remove a possible previous setting for this encoder before adding the new
+ // setting.
+ encoder_state_feedback->RemoveEncoder(encoder);
for (std::list<unsigned int>::const_iterator it = ssrcs.begin();
it != ssrcs.end(); ++it) {
encoder_state_feedback->AddEncoder(*it, encoder);