Revert "Optimize Android NV12 capture"

webrtc/api/androidvideotracksource.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_API_ANDROIDVIDEOTRACKSOURCE_H_
 #define WEBRTC_API_ANDROIDVIDEOTRACKSOURCE_H_
 
 #include "webrtc/api/android/jni/native_handle_impl.h"
 #include "webrtc/api/android/jni/surfacetexturehelper_jni.h"
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/notifier.h"
 #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/videosinkinterface.h"
+#include "third_party/libyuv/include/libyuv/convert.h"
 
 namespace webrtc {
 
 class AndroidVideoTrackSource : public Notifier<VideoTrackSourceInterface> {
  public:
   AndroidVideoTrackSource(rtc::Thread* signaling_thread,
                           JNIEnv* jni,
                           jobject j_egl_context,
                           bool is_screencast = false);
 
@@ skipping 48 matching lines @@
   rtc::ThreadChecker worker_thread_checker_;
   rtc::ThreadChecker camera_thread_checker_;
   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::CriticalSection apply_rotation_crit_;
   bool apply_rotation_ GUARDED_BY(apply_rotation_crit_);
-  std::vector<uint8_t> unscaled_uv_planes_;
-  webrtc::I420BufferPool buffer_pool_;
+  webrtc::I420BufferPool pre_scale_pool_;
+  webrtc::I420BufferPool post_scale_pool_;
   rtc::scoped_refptr<webrtc_jni::SurfaceTextureHelper> surface_texture_helper_;
   const bool is_screencast_;
 
   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
 
 #endif  // WEBRTC_API_ANDROIDVIDEOTRACKSOURCE_H_