Move direct use of VideoCapturer::VideoAdapter to VideoSinkWants.

webrtc/media/base/videobroadcaster.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 15 matching lines @@
 
   SinkPair* sink_pair = FindSinkPair(sink);
   if (!sink_pair) {
     sinks_.push_back(SinkPair(sink, wants));
   } else {
     sink_pair->wants = wants;
   }
 
   // Rotation must be applied by the source if one sink wants it.
   current_wants_.rotation_applied = false;
+  current_wants_.max_number_of_pixels = rtc::Optional<int>();
   for (auto& sink_pair : sinks_) {
     current_wants_.rotation_applied |= sink_pair.wants.rotation_applied;
+
+    if (!current_wants_.max_number_of_pixels) {

[nisse-webrtc, 2016/02/18 14:03:42]

I liked using SIZE_T_MAX (or whatever it's called) for "no restriction" better,
then this logic gets a lot simpler. 

Now, both unset and set to SIZE_T_MAX are possible, and with fully equivalent
meaning.

+      current_wants_.max_number_of_pixels =
+          sink_pair.wants.max_number_of_pixels;
+      continue;
+    }
+
+    if (sink_pair.wants.max_number_of_pixels &&
+        *current_wants_.max_number_of_pixels >
+            *sink_pair.wants.max_number_of_pixels) {
+      current_wants_.max_number_of_pixels =
+          sink_pair.wants.max_number_of_pixels;
+    }
   }
 }
 
 void VideoBroadcaster::RemoveSink(
     VideoSinkInterface<cricket::VideoFrame>* sink) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   RTC_DCHECK(sink != nullptr);
   RTC_DCHECK(FindSinkPair(sink));
 
   sinks_.erase(std::remove_if(sinks_.begin(), sinks_.end(),
@@ skipping 25 matching lines @@
   auto sink_pair_it = std::find_if(
       sinks_.begin(), sinks_.end(),
       [sink](const SinkPair& sink_pair) { return sink_pair.sink == sink; });
   if (sink_pair_it != sinks_.end()) {
     return &*sink_pair_it;
   }
   return nullptr;
 }
 
 }  // namespace rtc