| Index: webrtc/video/video_send_stream.cc
|
| diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
|
| index 466b5c2f00ad0f7adb7ff6947456d9ef5632431d..ec412b3cf2a89da6c979047dd386350d65fbd8dd 100644
|
| --- a/webrtc/video/video_send_stream.cc
|
| +++ b/webrtc/video/video_send_stream.cc
|
| @@ -629,7 +629,8 @@ VideoSendStream::VideoSendStream(
|
| stats_proxy_(Clock::GetRealTimeClock(),
|
| config,
|
| encoder_config.content_type),
|
| - config_(std::move(config)) {
|
| + config_(std::move(config)),
|
| + content_type_(encoder_config.content_type) {
|
| vie_encoder_.reset(new ViEEncoder(
|
| num_cpu_cores, &stats_proxy_, config_.encoder_settings,
|
| config_.pre_encode_callback, config_.post_encode_callback));
|
| @@ -692,6 +693,7 @@ void VideoSendStream::ReconfigureVideoEncoder(VideoEncoderConfig config) {
|
| // TODO(perkj): Some test cases in VideoSendStreamTest call
|
| // ReconfigureVideoEncoder from the network thread.
|
| // RTC_DCHECK_RUN_ON(&thread_checker_);
|
| + RTC_DCHECK(content_type_ == config.content_type);
|
| vie_encoder_->ConfigureEncoder(std::move(config), config_.rtp.max_packet_size,
|
| config_.rtp.nack.rtp_history_ms > 0);
|
| }
|
|
|