Let ViEEncoder express resolution requests as Sinkwants

webrtc/test/frame_generator.cc

Index: webrtc/test/frame_generator.cc
diff --git a/webrtc/test/frame_generator.cc b/webrtc/test/frame_generator.cc
index 302eafc0a48ea6c2aa43b0147f5f815ac0bb27c1..a4bf6475a433aa8e676f90fa357ed7ea9fabb090 100644
--- a/webrtc/test/frame_generator.cc
+++ b/webrtc/test/frame_generator.cc
@@ -256,6 +256,7 @@ void FrameForwarder::AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
   rtc::CritScope lock(&crit_);
   RTC_DCHECK(!sink_ || sink_ == sink);
   sink_ = sink;
+  sink_wants_ = wants;
 }
 
 void FrameForwarder::RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) {
@@ -264,6 +265,16 @@ void FrameForwarder::RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) {
   sink_ = nullptr;
 }
 
+rtc::VideoSinkWants FrameForwarder::current_sink_wants() const {

[åsapersson, 2016/10/31 08:43:02]

sink_wants()

[perkj_webrtc, 2016/10/31 19:45:18]

Done.

+  rtc::CritScope lock(&crit_);
+  return sink_wants_;
+}
+
+bool FrameForwarder::has_sinks() const {
+  rtc::CritScope lock(&crit_);
+  return sink_ != nullptr;
+}
+
 FrameGenerator* FrameGenerator::CreateChromaGenerator(size_t width,
                                                       size_t height) {
   return new ChromaGenerator(width, height);