| Index: webrtc/video/vie_encoder.cc
|
| diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc
|
| index 7880c4a275fd5e4589722bd269f0db44a421dc33..c0228f91369f8f68109086adcf50211ddd7135b9 100644
|
| --- a/webrtc/video/vie_encoder.cc
|
| +++ b/webrtc/video/vie_encoder.cc
|
| @@ -437,7 +437,7 @@ void ViEEncoder::ReconfigureEncoder() {
|
| static_cast<uint32_t>(max_data_payload_length_)) == VCM_OK;
|
| if (!success) {
|
| LOG(LS_ERROR) << "Failed to configure encoder.";
|
| - RTC_DCHECK(success);
|
| + rate_allocator_.reset();
|
| }
|
|
|
| video_sender_.UpdateChannelParemeters(rate_allocator_.get(),
|
| @@ -447,7 +447,9 @@ void ViEEncoder::ReconfigureEncoder() {
|
| if (framerate == 0)
|
| framerate = codec.maxFramerate;
|
| stats_proxy_->OnEncoderReconfigured(
|
| - encoder_config_, rate_allocator_->GetPreferredBitrateBps(framerate));
|
| + encoder_config_, rate_allocator_.get()
|
| + ? rate_allocator_->GetPreferredBitrateBps(framerate)
|
| + : codec.maxBitrate);
|
|
|
| pending_encoder_reconfiguration_ = false;
|
|
|
|
|