Move direct use of VideoCapturer::VideoAdapter to VideoSinkWants.

webrtc/media/base/videoadapter.h

 /*
  *  Copyright (c) 2010 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.
  */
 
 #ifndef WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_  // NOLINT
 #define WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_
 
 #include "webrtc/base/common.h"  // For ASSERT
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/base/optional.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/media/base/videocommon.h"
 
 namespace cricket {
 
 class VideoFrame;
 
 // VideoAdapter adapts an input video frame to an output frame based on the
 // specified input and output formats. The adaptation includes dropping frames
@@ skipping 107 matching lines @@
   // CPU process load threshold for reducing resolution.  e.g. 0.10f
   void set_process_threshold(float process_threshold);
   float process_threshold() const { return process_threshold_; }
 
   // Handle the format request from the server via Jingle update message.
   void OnOutputFormatRequest(const VideoFormat& format);
   // Handle the resolution request from the encoder due to bandwidth changes.
   void OnEncoderResolutionRequest(int width, int height, AdaptRequest request);
   // Handle the resolution request for CPU overuse.
   void OnCpuResolutionRequest(AdaptRequest request);
+  void OnCpuResolutionRequest(
+      rtc::Optional<int> max_pixel_count,
+      rtc::Optional<int> max_pixel_count_step_up);
+
   // Handle the CPU load provided by a CPU monitor.
   void OnCpuLoadUpdated(int current_cpus, int max_cpus,
                         float process_load, float system_load);
 
   sigslot::signal0<> SignalCpuAdaptationUnable;
 
  private:
   // Adapt to the minimum of the formats the server requests, the CPU wants, and
   // the encoder wants. Returns true if resolution changed.
   bool AdaptToMinimumFormat(int* new_width, int* new_height);
@@ skipping 30 matching lines @@
   // The weighted average of cpu load over time. It's always updated (if cpu
   // adaptation is on), but only used if cpu_smoothing_ is set.
   float system_load_average_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(CoordinatedVideoAdapter);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_  // NOLINT