From 2d03b8b2178db1ea4458d84f9208c80114849131 Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Thu, 19 Jan 2012 21:21:15 +0000 Subject: [PATCH] REMB now works for two consecutive calls with different channels but same ViE instance. BUG=241 Review URL: https://webrtc-codereview.appspot.com/361001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1484 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/video_engine/vie_channel_manager.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/video_engine/vie_channel_manager.cc b/src/video_engine/vie_channel_manager.cc index 62822dbe11..73145e31cc 100644 --- a/src/video_engine/vie_channel_manager.cc +++ b/src/video_engine/vie_channel_manager.cc @@ -238,6 +238,12 @@ int ViEChannelManager::DeleteChannel(int channel_id) { } vie_channel = reinterpret_cast(map_item->GetItem()); channel_map_.Erase(map_item); + + // Deregister possible remb modules. + RtpRtcp* rtp_module = vie_channel->rtp_rtcp(); + remb_->RemoveSendChannel(rtp_module); + remb_->RemoveReceiveChannel(rtp_module); + // Deregister the channel from the ViEEncoder to stop the media flow. vie_channel->DeregisterSendRtpRtcpModule(); ReturnChannelId(channel_id);