generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 75875619-> 75878731

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7235 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-09-19 06:46:37 +00:00
parent b5a5c44ef7
commit 6e5c78422d
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
talk/media/webrtc/webrtcvideoengine.cc
View File

@ -1612,12 +1612,6 @@ WebRtcVideoMediaChannel::~WebRtcVideoMediaChannel() {
const bool render = false; const bool render = false;
SetRender(render); SetRender(render);
if (voice_channel_) {
WebRtcVoiceMediaChannel* voice_channel =
static_cast<WebRtcVoiceMediaChannel*>(voice_channel_);
voice_channel->SetupSharedBandwidthEstimation(NULL, -1);
}
while (!send_channels_.empty()) { while (!send_channels_.empty()) {
if (!DeleteSendChannel(send_channels_.begin()->first)) { if (!DeleteSendChannel(send_channels_.begin()->first)) {
LOG(LS_ERROR) << "Unable to delete channel with ssrc key " LOG(LS_ERROR) << "Unable to delete channel with ssrc key "

3
talk/media/webrtc/webrtcvoiceengine.cc
View File

@ -1834,8 +1834,7 @@ WebRtcVoiceMediaChannel::WebRtcVoiceMediaChannel(WebRtcVoiceEngine *engine)
WebRtcVoiceMediaChannel::~WebRtcVoiceMediaChannel() { WebRtcVoiceMediaChannel::~WebRtcVoiceMediaChannel() {
LOG(LS_VERBOSE) << "WebRtcVoiceMediaChannel::~WebRtcVoiceMediaChannel " LOG(LS_VERBOSE) << "WebRtcVoiceMediaChannel::~WebRtcVoiceMediaChannel "
<< voe_channel(); << voe_channel();
ASSERT(shared_bwe_vie_ == NULL); SetupSharedBandwidthEstimation(NULL, -1);
ASSERT(shared_bwe_vie_channel_ == -1);
// Remove any remaining send streams, the default channel will be deleted // Remove any remaining send streams, the default channel will be deleted
// later. // later.