diff options
| author | mflodman@webrtc.org <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-10-25 13:06:22 +0000 |
|---|---|---|
| committer | mflodman@webrtc.org <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-10-25 13:06:22 +0000 |
| commit | ff9854b939dd2dfb7321ca08be5cc33f78f3cbbb (patch) | |
| tree | 8ee75fc4a96cbf2f0777a5bd9b91fc870f47a4ef /video_engine/vie_channel_manager.cc | |
| parent | 07004dd41a51507284924b3b39253fa2eb509c0f (diff) | |
| download | webrtc-ff9854b939dd2dfb7321ca08be5cc33f78f3cbbb.tar.gz | |
Only remove encoder state feedback for send channels.
BUG=1000
TEST=See bug
Review URL: https://webrtc-codereview.appspot.com/938004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@2994 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_channel_manager.cc')
| -rw-r--r-- | video_engine/vie_channel_manager.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/video_engine/vie_channel_manager.cc b/video_engine/vie_channel_manager.cc index 9fabd8d4..13be55c8 100644 --- a/video_engine/vie_channel_manager.cc +++ b/video_engine/vie_channel_manager.cc @@ -229,7 +229,11 @@ int ViEChannelManager::DeleteChannel(int channel_id) { group = FindGroup(channel_id); group->SetChannelRembStatus(channel_id, false, false, vie_channel, vie_encoder); - group->GetEncoderStateFeedback()->RemoveEncoder(vie_encoder); + + // Remove the feedback if we're owning the encoder. + if (vie_encoder->channel_id() == channel_id) { + group->GetEncoderStateFeedback()->RemoveEncoder(vie_encoder); + } unsigned int remote_ssrc = 0; vie_channel->GetRemoteSSRC(&remote_ssrc); |