| Index: webrtc/media/engine/webrtcvideoengine2.cc
|
| diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
|
| index fe5c610d081aa9bbccded1cb510297c534200dba..76f59d8639ae0d43aa3ff4af2c922dcf15138dcc 100644
|
| --- a/webrtc/media/engine/webrtcvideoengine2.cc
|
| +++ b/webrtc/media/engine/webrtcvideoengine2.cc
|
| @@ -1185,10 +1185,12 @@ bool WebRtcVideoChannel2::AddRecvStream(const StreamParams& sp,
|
| config.rtp.remb = send_codec_ ? HasRemb(send_codec_->codec) : false;
|
| config.rtp.transport_cc =
|
| send_codec_ ? HasTransportCc(send_codec_->codec) : false;
|
| + config.disable_prerenderer_smoothing =
|
| + video_config_.disable_prerenderer_smoothing;
|
|
|
| receive_streams_[ssrc] = new WebRtcVideoReceiveStream(
|
| call_, sp, config, external_decoder_factory_, default_stream,
|
| - recv_codecs_, video_config_.disable_prerenderer_smoothing);
|
| + recv_codecs_);
|
|
|
| return true;
|
| }
|
| @@ -2207,8 +2209,7 @@ WebRtcVideoChannel2::WebRtcVideoReceiveStream::WebRtcVideoReceiveStream(
|
| const webrtc::VideoReceiveStream::Config& config,
|
| WebRtcVideoDecoderFactory* external_decoder_factory,
|
| bool default_stream,
|
| - const std::vector<VideoCodecSettings>& recv_codecs,
|
| - bool disable_prerenderer_smoothing)
|
| + const std::vector<VideoCodecSettings>& recv_codecs)
|
| : call_(call),
|
| ssrcs_(sp.ssrcs),
|
| ssrc_groups_(sp.ssrc_groups),
|
| @@ -2216,7 +2217,6 @@ WebRtcVideoChannel2::WebRtcVideoReceiveStream::WebRtcVideoReceiveStream(
|
| default_stream_(default_stream),
|
| config_(config),
|
| external_decoder_factory_(external_decoder_factory),
|
| - disable_prerenderer_smoothing_(disable_prerenderer_smoothing),
|
| sink_(NULL),
|
| last_width_(-1),
|
| last_height_(-1),
|
| @@ -2435,11 +2435,6 @@ void WebRtcVideoChannel2::WebRtcVideoReceiveStream::OnFrame(
|
| sink_->OnFrame(render_frame);
|
| }
|
|
|
| -bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::SmoothsRenderedFrames()
|
| - const {
|
| - return disable_prerenderer_smoothing_;
|
| -}
|
| -
|
| bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::IsDefaultStream() const {
|
| return default_stream_;
|
| }
|
|
|