Add framerate to VideoSinkWants and ability to signal on overuse

webrtc/test/vcm_capturer.cc

 /*
  *  Copyright (c) 2013 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.
  */
 
 #include "webrtc/test/vcm_capturer.h"
 
+#include "webrtc/api/video/i420_buffer.h"
+#include "webrtc/media/base/videoadapter.h"
 #include "webrtc/modules/video_capture/video_capture_factory.h"
 #include "webrtc/video_send_stream.h"
 
 namespace webrtc {
 namespace test {
 
-VcmCapturer::VcmCapturer() : started_(false), sink_(nullptr), vcm_(NULL) {}
+VcmCapturer::VcmCapturer()
+    : started_(false),
+      sink_(nullptr),
+      vcm_(nullptr),
+      video_adpter_(new cricket::VideoAdapter()) {}
 
 bool VcmCapturer::Init(size_t width, size_t height, size_t target_fps) {
   VideoCaptureModule::DeviceInfo* device_info =
       VideoCaptureFactory::CreateDeviceInfo();
 
   char device_name[256];
   char unique_name[256];
   if (device_info->GetDeviceName(0, device_name, sizeof(device_name),
                                  unique_name, sizeof(unique_name)) !=
       0) {
@@ skipping 43 matching lines @@
 void VcmCapturer::Stop() {
   rtc::CritScope lock(&crit_);
   started_ = false;
 }
 
 void VcmCapturer::AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
                                   const rtc::VideoSinkWants& wants) {
   rtc::CritScope lock(&crit_);
   RTC_CHECK(!sink_ || sink_ == sink);
   sink_ = sink;
+  video_adpter_->OnResolutionFramerateRequest(
+      wants.target_pixel_count, wants.max_pixel_count, wants.max_framerate_fps);
 }
 
 void VcmCapturer::RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) {
   rtc::CritScope lock(&crit_);
   RTC_CHECK(sink_ == sink);
   sink_ = nullptr;
 }
 
 void VcmCapturer::Destroy() {
   if (!vcm_)
     return;
 
   vcm_->StopCapture();
   vcm_->DeRegisterCaptureDataCallback();
   // Release reference to VCM.
   vcm_ = nullptr;
 }
 
 VcmCapturer::~VcmCapturer() { Destroy(); }
 
 void VcmCapturer::OnFrame(const VideoFrame& frame) {
   rtc::CritScope lock(&crit_);
-  if (started_ && sink_)
+  if (started_ && sink_) {
+    int cropped_width = 0;
+    int cropped_height = 0;
+    int out_width = 0;
+    int out_height = 0;
+    if (!video_adpter_->AdaptFrameResolution(
+            frame.width(), frame.height(), frame.timestamp_us() * 1000,
+            &cropped_width, &cropped_height, &out_width, &out_height)) {
+      return;
+    }
+
+    if (out_height != frame.height() || out_width != frame.width()) {
+      rtc::scoped_refptr<I420Buffer> scaled_buffer =
+          I420Buffer::Create(out_width, out_height);
+      scaled_buffer->ScaleFrom(*frame.video_frame_buffer().get());
+      VideoFrame adapted_frame(scaled_buffer, kVideoRotation_0,
+                               frame.timestamp_us());
+      sink_->OnFrame(adapted_frame);
+      return;
+    }

[kthelgason, 2017/03/14 10:01:20]

Is it possible to share this logic somewhere so we can avoid having it in
multiple places? Maybe in webrtc/test/video_capturer.h or some other common
place.

[sprang_webrtc, 2017/03/14 14:15:02]

Done. Also did some general cleanup in this class since I didn't feel the cl was
quite big enough yet.

+
     sink_->OnFrame(frame);
+  }
 }
 
 }  // test
 }  // webrtc