VideoAdapter: Add cropping based on OnOutputFormatRequest()

webrtc/media/base/videocapturer.cc

 /*
  *  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.
  */
 
@@ skipping 202 matching lines @@
                                          wants.max_pixel_count_step_up);
   }
 }
 
 void VideoCapturer::OnFrameCaptured(VideoCapturer*,
                                     const CapturedFrame* captured_frame) {
   if (!broadcaster_.frame_wanted()) {
     return;
   }
 
-  int adapted_width = captured_frame->width;
-  int adapted_height = captured_frame->height;
+  int cropped_width = captured_frame->width;
+  int cropped_height = captured_frame->height;
+  int out_width = captured_frame->width;
+  int out_height = captured_frame->height;
   if (enable_video_adapter_ && !IsScreencast()) {
-    const VideoFormat adapted_format =
-        video_adapter_.AdaptFrameResolution(adapted_width, adapted_height);
-    if (adapted_format.IsSize0x0()) {
+    video_adapter_.AdaptFrameResolution(
+        captured_frame->width, captured_frame->height,
+        &cropped_width, &cropped_height,
+        &out_width, &out_height);
+    if (out_width == 0 || out_height == 0) {
       // VideoAdapter dropped the frame.
       return;
     }
-    adapted_width = adapted_format.width;
-    adapted_height = adapted_format.height;
   }
 
   if (!frame_factory_) {
     LOG(LS_ERROR) << "No video frame factory.";
     return;
   }
 
-  // TODO(nisse): Reorganize frame factory methods, deleting crop
-  // support there too.
+  // TODO(nisse): Reorganize frame factory methods.
   std::unique_ptr<VideoFrame> adapted_frame(frame_factory_->CreateAliasedFrame(
-      captured_frame, captured_frame->width, captured_frame->height,
-      adapted_width, adapted_height));
+      captured_frame, cropped_width, cropped_height, out_width, out_height));
 
   if (!adapted_frame) {
     // TODO(fbarchard): LOG more information about captured frame attributes.
     LOG(LS_ERROR) << "Couldn't convert to I420! "
                   << "From " << ToString(captured_frame) << " To "
-                  << adapted_width << " x " << adapted_height;
+                  << out_width << " x " << out_height;
     return;
   }
 
   OnFrame(this, adapted_frame.get());
   UpdateInputSize(captured_frame);
 }
 
 void VideoCapturer::OnFrame(VideoCapturer* capturer, const VideoFrame* frame) {
   broadcaster_.OnFrame(*frame);
 }
@@ skipping 139 matching lines @@
 void VideoCapturer::UpdateInputSize(const CapturedFrame* captured_frame) {
   // Update stats protected from fetches from different thread.
   rtc::CritScope cs(&frame_stats_crit_);
 
   input_size_valid_ = true;
   input_width_ = captured_frame->width;
   input_height_ = captured_frame->height;
 }
 
 }  // namespace cricket