Chromium Code Reviews| Index: talk/media/webrtc/webrtcvideoengine2.cc |
| diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc |
| index 101ed15bddd996d4e51d462d537f4d50ee613dd4..8d963aa060becbed3602d2a298fc0f208cf18660 100644 |
| --- a/talk/media/webrtc/webrtcvideoengine2.cc |
| +++ b/talk/media/webrtc/webrtcvideoengine2.cc |
| @@ -1228,7 +1228,7 @@ bool WebRtcVideoChannel2::AddRecvStream(const StreamParams& sp, |
| receive_streams_[ssrc] = new WebRtcVideoReceiveStream( |
| call_, sp, config, external_decoder_factory_, default_stream, |
| - recv_codecs_); |
| + recv_codecs_, options_.disable_prerenderer_smoothing.value_or(false)); |
| return true; |
| } |
| @@ -2337,6 +2337,22 @@ WebRtcVideoChannel2::WebRtcVideoReceiveStream::WebRtcVideoReceiveStream( |
| WebRtcVideoDecoderFactory* external_decoder_factory, |
| bool default_stream, |
| const std::vector<VideoCodecSettings>& recv_codecs) |
| + : WebRtcVideoReceiveStream(call, |
| + sp, |
| + config, |
| + external_decoder_factory, |
| + default_stream, |
| + recv_codecs, |
| + false) {} |
| + |
| +WebRtcVideoChannel2::WebRtcVideoReceiveStream::WebRtcVideoReceiveStream( |
|
mflodman
2015/11/23 14:43:43
I'd prefer to only have on constructor.
qiangchen
2015/11/24 00:21:05
You are right, this is a private class, thus no wo
|
| + webrtc::Call* call, |
| + const StreamParams& sp, |
| + const webrtc::VideoReceiveStream::Config& config, |
| + WebRtcVideoDecoderFactory* external_decoder_factory, |
| + bool default_stream, |
| + const std::vector<VideoCodecSettings>& recv_codecs, |
| + bool disable_prerenderer_smoothing) |
| : call_(call), |
| ssrcs_(sp.ssrcs), |
| ssrc_groups_(sp.ssrc_groups), |
| @@ -2344,6 +2360,7 @@ WebRtcVideoChannel2::WebRtcVideoReceiveStream::WebRtcVideoReceiveStream( |
| default_stream_(default_stream), |
| config_(config), |
| external_decoder_factory_(external_decoder_factory), |
| + disable_prerenderer_smoothing_(disable_prerenderer_smoothing), |
| renderer_(NULL), |
| last_width_(-1), |
| last_height_(-1), |
| @@ -2551,6 +2568,11 @@ bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::IsTextureSupported() const { |
| return true; |
| } |
| +bool WebRtcVideoChannel2::WebRtcVideoReceiveStream:: |
| + PrerendererSmoothingDisabled() const { |
| + return disable_prerenderer_smoothing_; |
| +} |
| + |
| bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::IsDefaultStream() const { |
| return default_stream_; |
| } |