Delete AndroidVideoCapturer::FrameFactory.

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 196 matching lines @@
   if (frame_factory_) {
     frame_factory_->SetApplyRotation(apply_rotation_);
   }
 
   if (video_adapter()) {
     video_adapter()->OnResolutionRequest(wants.max_pixel_count,
                                          wants.max_pixel_count_step_up);
   }
 }
 
+bool VideoCapturer::AdaptFrame(int width,
+                               int height,
+                               int* out_width,
+                               int* out_height,
+                               int* crop_width,
+                               int* crop_height,
+                               int* crop_x,
+                               int* crop_y) {
+  if (!broadcaster_.frame_wanted()) {
+    return false;
+  }
+
+  if (enable_video_adapter_ && !IsScreencast()) {
+    if (!video_adapter_.AdaptFrameResolution(
+            width, height, crop_width, crop_height, out_width, out_height))

[magjed_webrtc, 2016/05/17 12:12:40]

nit: Add {}

[nisse-webrtc, 2016/05/18 11:16:34]

Done.

+      // VideoAdapter dropped the frame.
+      return false;
+    *crop_x = (width - *crop_width) / 2;
+    *crop_y = (height - *crop_height) / 2;
+  } else {
+    *out_width = width;
+    *out_height = height;
+    *crop_width = width;
+    *crop_height = height;
+    *crop_x = 0;
+    *crop_y = 0;
+  }
+  return true;
+}
+
 void VideoCapturer::OnFrameCaptured(VideoCapturer*,
                                     const CapturedFrame* captured_frame) {
-  if (!broadcaster_.frame_wanted()) {
+  int out_width;
+  int out_height;
+  int crop_width;
+  int crop_height;
+  int crop_x;
+  int crop_y;
+
+  if (!AdaptFrame(captured_frame->width, captured_frame->height,
+                  &out_width, &out_height,
+                  &crop_width, &crop_height, &crop_x, &crop_y)) {
     return;
   }
 
-  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()) {
-    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;
-    }
-  }
-
   if (!frame_factory_) {
     LOG(LS_ERROR) << "No video frame factory.";
     return;
   }
 
-  // TODO(nisse): Reorganize frame factory methods.
+  // TODO(nisse): Reorganize frame factory methods. crop_x and crop_y
+  // are ignored for now.
   std::unique_ptr<VideoFrame> adapted_frame(frame_factory_->CreateAliasedFrame(
-      captured_frame, cropped_width, cropped_height, out_width, out_height));
+      captured_frame, crop_width, crop_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 "
                   << out_width << " x " << out_height;
     return;
   }
 
-  OnFrame(this, adapted_frame.get());
-  UpdateInputSize(captured_frame);
+  OnFrame(*adapted_frame, captured_frame->width, captured_frame->height);
 }
 
-void VideoCapturer::OnFrame(VideoCapturer* capturer, const VideoFrame* frame) {
-  broadcaster_.OnFrame(*frame);
+void VideoCapturer::OnFrame(const VideoFrame& frame,
+                            int orig_width,
+                            int orig_height) {
+  broadcaster_.OnFrame(frame);
+  UpdateInputSize(orig_width, orig_height);
 }
 
 void VideoCapturer::SetCaptureState(CaptureState state) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   if (state == capture_state_) {
     // Don't trigger a state changed callback if the state hasn't changed.
     return;
   }
   capture_state_ = state;
   SignalStateChange(this, capture_state_);
@@ skipping 120 matching lines @@
 
 bool VideoCapturer::ShouldFilterFormat(const VideoFormat& format) const {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   if (!enable_camera_list_) {
     return false;
   }
   return format.width > max_format_->width ||
          format.height > max_format_->height;
 }
 
-void VideoCapturer::UpdateInputSize(const CapturedFrame* captured_frame) {
+void VideoCapturer::UpdateInputSize(int width, int height) {
   // 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;
+  input_width_ = width;
+  input_height_ = height;
 }
 
 }  // namespace cricket