Chromium Code Reviews| Index: webrtc/media/engine/fakewebrtccall.cc |
| diff --git a/webrtc/media/engine/fakewebrtccall.cc b/webrtc/media/engine/fakewebrtccall.cc |
| index 88f9927446944fa929458aec9d8382d5c25dbbc6..15c1ce9a78cc97d6c0547b599789eb197f81d966 100644 |
| --- a/webrtc/media/engine/fakewebrtccall.cc |
| +++ b/webrtc/media/engine/fakewebrtccall.cc |
| @@ -104,6 +104,7 @@ FakeVideoSendStream::FakeVideoSendStream( |
| : sending_(false), |
| config_(std::move(config)), |
| codec_settings_set_(false), |
| + resolution_scaling_disabled_(false), |
| source_(nullptr), |
| num_swapped_frames_(0) { |
| RTC_DCHECK(config.encoder_settings.encoder != NULL); |
| @@ -233,13 +234,22 @@ void FakeVideoSendStream::Stop() { |
| } |
| void FakeVideoSendStream::SetSource( |
| - rtc::VideoSourceInterface<webrtc::VideoFrame>* source) { |
| + rtc::VideoSourceInterface<webrtc::VideoFrame>* source, |
| + bool disable_resolution_scaling) { |
| RTC_DCHECK(source != source_); |
| if (source_) |
| source_->RemoveSink(this); |
| source_ = source; |
| + resolution_scaling_disabled_ = disable_resolution_scaling; |
| if (source) |
|
perkj_webrtc
2016/10/04 08:53:26
{}
|
| - source->AddOrUpdateSink(this, rtc::VideoSinkWants()); |
| + source->AddOrUpdateSink( |
| + this, disable_resolution_scaling ? rtc::VideoSinkWants() : sink_wants_); |
| +} |
| + |
| +void FakeVideoSendStream::InjectVideoSinkWants( |
| + const rtc::VideoSinkWants& wants) { |
| + sink_wants_ = wants; |
| + source_->AddOrUpdateSink(this, wants); |
| } |
| FakeVideoReceiveStream::FakeVideoReceiveStream( |