New helper class AdaptedVideoSource.

webrtc/api/androidvideotracksource.h

Index: webrtc/api/androidvideotracksource.h
diff --git a/webrtc/api/androidvideotracksource.h b/webrtc/api/androidvideotracksource.h
index 2bbecc82c9480a8d752a62b0663f95192cfdda71..018799e5bff0f16bb28c71cdd34e8a5f5a391bd5 100644
--- a/webrtc/api/androidvideotracksource.h
+++ b/webrtc/api/androidvideotracksource.h
@@ -18,10 +18,8 @@
 #include "webrtc/base/asyncinvoker.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/thread_checker.h"
-#include "webrtc/base/timestampaligner.h"
 #include "webrtc/common_video/include/i420_buffer_pool.h"
-#include "webrtc/media/base/videoadapter.h"
-#include "webrtc/media/base/videobroadcaster.h"
+#include "webrtc/media/base/adaptedvideosource.h"
 #include "webrtc/media/base/videosinkinterface.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
 
@@ -87,9 +85,7 @@ class AndroidVideoTrackSource : public Notifier<VideoTrackSourceInterface> {
   rtc::CriticalSection stats_crit_;
   rtc::Optional<Stats> stats_ GUARDED_BY(stats_crit_);
   SourceState state_;
-  rtc::VideoBroadcaster broadcaster_;
-  rtc::TimestampAligner timestamp_aligner_;
-  cricket::VideoAdapter video_adapter_;
+  rtc::AdaptedVideoSource adapted_source_;
   rtc::CriticalSection apply_rotation_crit_;
   bool apply_rotation_ GUARDED_BY(apply_rotation_crit_);
   webrtc::I420BufferPool pre_scale_pool_;
@@ -100,17 +96,6 @@ class AndroidVideoTrackSource : public Notifier<VideoTrackSourceInterface> {
   void OnFrame(const cricket::VideoFrame& frame, int width, int height);
 
   void OnSinkWantsChanged(const rtc::VideoSinkWants& wants);
-
-  bool 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);
 };
 
 }  // namespace webrtc