diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc index 4261ffbea..8d8b36cc2 100644 --- a/talk/media/webrtc/webrtcvideoengine.cc +++ b/talk/media/webrtc/webrtcvideoengine.cc @@ -1612,12 +1612,6 @@ WebRtcVideoMediaChannel::~WebRtcVideoMediaChannel() { const bool render = false; SetRender(render); - if (voice_channel_) { - WebRtcVoiceMediaChannel* voice_channel = - static_cast(voice_channel_); - voice_channel->SetupSharedBandwidthEstimation(NULL, -1); - } - while (!send_channels_.empty()) { if (!DeleteSendChannel(send_channels_.begin()->first)) { LOG(LS_ERROR) << "Unable to delete channel with ssrc key " diff --git a/talk/media/webrtc/webrtcvoiceengine.cc b/talk/media/webrtc/webrtcvoiceengine.cc index 3d5d9ee66..a524badc7 100644 --- a/talk/media/webrtc/webrtcvoiceengine.cc +++ b/talk/media/webrtc/webrtcvoiceengine.cc @@ -1834,8 +1834,7 @@ WebRtcVoiceMediaChannel::WebRtcVoiceMediaChannel(WebRtcVoiceEngine *engine) WebRtcVoiceMediaChannel::~WebRtcVoiceMediaChannel() { LOG(LS_VERBOSE) << "WebRtcVoiceMediaChannel::~WebRtcVoiceMediaChannel " << voe_channel(); - ASSERT(shared_bwe_vie_ == NULL); - ASSERT(shared_bwe_vie_channel_ == -1); + SetupSharedBandwidthEstimation(NULL, -1); // Remove any remaining send streams, the default channel will be deleted // later.