Index: webrtc/video/vie_encoder.cc |
diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc |
index 4591d89599a66f71d90adfaca33d6465d0645f89..f083adcd7ba98b5500a14d521460c7795a9a2617 100644 |
--- a/webrtc/video/vie_encoder.cc |
+++ b/webrtc/video/vie_encoder.cc |
@@ -438,13 +438,12 @@ void ViEEncoder::ReconfigureEncoder() { |
static_cast<uint32_t>(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_); |
åsapersson
2017/03/15 11:03:01
nit: check spacing
ilnik
2017/03/15 11:04:51
Done.
|
+ |
int framerate = stats_proxy_->GetSendFrameRate(); |
if (framerate == 0) |
framerate = codec.maxFramerate; |