From 35b7de480b1ae796e232fd862e4fa3e6704dca0e Mon Sep 17 00:00:00 2001 From: ilnik Date: Wed, 15 Mar 2017 04:24:21 -0700 Subject: [PATCH] Fix crash in vie_encoder when encoder configure fails Bad changes are from CL 2745523002. These changes were originally done by Sprang@. Sometimes, when encoder is failed to be configured on release build it causes a crash at vie_encoder.cc:451. That changes look like they are not important to other changes. This CL is simply reverting them. BUG=chromium:701526 Review-Url: https://codereview.webrtc.org/2747403002 Cr-Commit-Position: refs/heads/master@{#17241} --- webrtc/video/vie_encoder.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc index 4591d89599..c30752b6df 100644 --- a/webrtc/video/vie_encoder.cc +++ b/webrtc/video/vie_encoder.cc @@ -438,13 +438,12 @@ void ViEEncoder::ReconfigureEncoder() { static_cast(max_data_payload_length_)) == VCM_OK; if (!success) { LOG(LS_ERROR) << "Failed to configure encoder."; - rate_allocator_.reset(); RTC_DCHECK(success); - } else { - video_sender_.UpdateChannelParemeters(rate_allocator_.get(), - bitrate_observer_); } + video_sender_.UpdateChannelParemeters(rate_allocator_.get(), + bitrate_observer_); + int framerate = stats_proxy_->GetSendFrameRate(); if (framerate == 0) framerate = codec.maxFramerate;