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
This commit is contained in:
mflodman@webrtc.org
2012-01-19 21:21:15 +00:00
parent e7c2a5f13c
commit 2d03b8b217

View File

@@ -238,6 +238,12 @@ int ViEChannelManager::DeleteChannel(int channel_id) {
} }
vie_channel = reinterpret_cast<ViEChannel*>(map_item->GetItem()); vie_channel = reinterpret_cast<ViEChannel*>(map_item->GetItem());
channel_map_.Erase(map_item); 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. // Deregister the channel from the ViEEncoder to stop the media flow.
vie_channel->DeregisterSendRtpRtcpModule(); vie_channel->DeregisterSendRtpRtcpModule();
ReturnChannelId(channel_id); ReturnChannelId(channel_id);