Let ViEEncoder express resolution requests as Sinkwants

webrtc/media/engine/fakewebrtccall.h

Index: webrtc/media/engine/fakewebrtccall.h
diff --git a/webrtc/media/engine/fakewebrtccall.h b/webrtc/media/engine/fakewebrtccall.h
index db3db1884d77fb9f01d74e99d588d45c53c30631..a6fc303c628968dbe7d694ff51a460f336f40c4c 100644
--- a/webrtc/media/engine/fakewebrtccall.h
+++ b/webrtc/media/engine/fakewebrtccall.h
@@ -127,6 +127,11 @@ class FakeVideoSendStream final
   void EnableEncodedFrameRecording(const std::vector<rtc::PlatformFile>& files,
                                    size_t byte_limit) override;
 
+  bool resolution_scaling_disabled() { return resolution_scaling_disabled_; }

[åsapersson, 2016/10/24 07:54:05]

const method

[perkj_webrtc, 2016/10/26 16:40:16]

Done.

+  void InjectVideoSinkWants(const rtc::VideoSinkWants& wants);
+
+  rtc::VideoSourceInterface<webrtc::VideoFrame>* source() { return source_; }

[åsapersson, 2016/10/24 07:54:05]

ditto

[perkj_webrtc, 2016/10/26 16:40:16]

Done.

+
  private:
   // rtc::VideoSinkInterface<VideoFrame> implementation.
   void OnFrame(const webrtc::VideoFrame& frame) override;
@@ -134,8 +139,8 @@ class FakeVideoSendStream final
   // webrtc::VideoSendStream implementation.
   void Start() override;
   void Stop() override;
-  void SetSource(
-      rtc::VideoSourceInterface<webrtc::VideoFrame>* source) override;
+  void SetSource(rtc::VideoSourceInterface<webrtc::VideoFrame>* source,
+                 bool disable_resolution_scaling) override;
   webrtc::VideoSendStream::Stats GetStats() override;
   void ReconfigureVideoEncoder(webrtc::VideoEncoderConfig config) override;
 
@@ -143,11 +148,14 @@ class FakeVideoSendStream final
   webrtc::VideoSendStream::Config config_;
   webrtc::VideoEncoderConfig encoder_config_;
   std::vector<webrtc::VideoStream> video_streams_;
+  rtc::VideoSinkWants sink_wants_;
+
   bool codec_settings_set_;
   union VpxSettings {
     webrtc::VideoCodecVP8 vp8;
     webrtc::VideoCodecVP9 vp9;
   } vpx_settings_;
+  bool resolution_scaling_disabled_;

[åsapersson, 2016/10/24 07:54:05]

change to resolution_scaling_enabled_?

[perkj_webrtc, 2016/10/26 16:40:16]

Done.

   rtc::VideoSourceInterface<webrtc::VideoFrame>* source_;
   int num_swapped_frames_;
   webrtc::VideoFrame last_frame_;