New helper class AdaptedVideoSource.

webrtc/api/androidvideotracksource.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 82 matching lines @@
              rotation == 270);
 
   int adapted_width;
   int adapted_height;
   int crop_width;
   int crop_height;
   int crop_x;
   int crop_y;
   int64_t translated_camera_time_us;
 
-  if (!AdaptFrame(width, height, timestamp_ns / rtc::kNumNanosecsPerMicrosec,
-                  &adapted_width, &adapted_height, &crop_width, &crop_height,
-                  &crop_x, &crop_y, &translated_camera_time_us)) {
+  if (!adapted_source_.AdaptFrame(
+          width, height, timestamp_ns / rtc::kNumNanosecsPerMicrosec,
+          rtc::TimeMicros(),
+          &adapted_width, &adapted_height, &crop_width, &crop_height,
+          &crop_x, &crop_y, &translated_camera_time_us)) {
     return;
   }
 
   int rotated_width = crop_width;
   int rotated_height = crop_height;
 
   rtc::CritScope lock(&apply_rotation_crit_);
   if (apply_rotation_ && (rotation == 90 || rotation == 270)) {
     std::swap(adapted_width, adapted_height);
     std::swap(rotated_width, rotated_height);
@@ skipping 47 matching lines @@
              rotation == 270);
 
   int adapted_width;
   int adapted_height;
   int crop_width;
   int crop_height;
   int crop_x;
   int crop_y;
   int64_t translated_camera_time_us;
 
-  if (!AdaptFrame(width, height, timestamp_ns / rtc::kNumNanosecsPerMicrosec,
-                  &adapted_width, &adapted_height, &crop_width, &crop_height,
-                  &crop_x, &crop_y, &translated_camera_time_us)) {
+  if (!adapted_source_.AdaptFrame(
+          width, height, timestamp_ns / rtc::kNumNanosecsPerMicrosec,
+          &adapted_width, &adapted_height, &crop_width, &crop_height,
+          &crop_x, &crop_y, &translated_camera_time_us)) {
     surface_texture_helper_->ReturnTextureFrame();
     return;
   }
 
   webrtc_jni::Matrix matrix = handle.sampling_matrix;
 
   matrix.Crop(crop_width / static_cast<float>(width),
               crop_height / static_cast<float>(height),
               crop_x / static_cast<float>(width),
               crop_y / static_cast<float>(height));
@@ skipping 28 matching lines @@
   broadcaster_.OnFrame(frame);
 }
 
 void AndroidVideoTrackSource::OnOutputFormatRequest(int width,
                                                     int height,
                                                     int fps) {
   RTC_DCHECK(camera_thread_checker_.CalledOnValidThread());
 
   cricket::VideoFormat format(width, height,
                               cricket::VideoFormat::FpsToInterval(fps), 0);
-  video_adapter_.OnOutputFormatRequest(format);
-}
-
-bool AndroidVideoTrackSource::AdaptFrame(int width,
-                                         int height,
-                                         int64_t camera_time_us,
-                                         int* out_width,
-                                         int* out_height,
-                                         int* crop_width,
-                                         int* crop_height,
-                                         int* crop_x,
-                                         int* crop_y,
-                                         int64_t* translated_camera_time_us) {
-  RTC_DCHECK(camera_thread_checker_.CalledOnValidThread());
-
-  int64_t system_time_us = rtc::TimeMicros();
-
-  int64_t offset_us =
-      timestamp_aligner_.UpdateOffset(camera_time_us, system_time_us);
-
-  if (!broadcaster_.frame_wanted()) {
-    return false;
-  }
-
-  if (!video_adapter_.AdaptFrameResolution(
-          width, height, camera_time_us * rtc::kNumNanosecsPerMicrosec,
-          crop_width, crop_height, out_width, out_height)) {
-    // VideoAdapter dropped the frame.
-    return false;
-  }
-  *crop_x = (width - *crop_width) / 2;
-  *crop_y = (height - *crop_height) / 2;
-
-  *translated_camera_time_us = timestamp_aligner_.ClipTimestamp(
-      camera_time_us + offset_us, system_time_us);
-  return true;
+  adapted_source_.video_adapter()->OnOutputFormatRequest(format);
 }
 
 }  // namespace webrtc