Revert of Delete deprecated and transitional stuff related to video frame refactoring.

webrtc/sdk/android/src/jni/native_handle_impl.cc

 /*
  *  Copyright 2015 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.
  */
 
 #include "webrtc/sdk/android/src/jni/native_handle_impl.h"
 
 #include <memory>
 
-#include "webrtc/api/video/i420_buffer.h"
+#include "webrtc/sdk/android/src/jni/jni_helpers.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/keep_ref_until_done.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
 
 using webrtc::NativeHandleBuffer;
 
 namespace webrtc_jni {
 
 Matrix::Matrix(JNIEnv* jni, jfloatArray a) {
   RTC_CHECK_EQ(16, jni->GetArrayLength(a));
   jfloat* ptr = jni->GetFloatArrayElements(a, nullptr);
   for (int i = 0; i < 16; ++i) {
     elem_[i] = ptr[i];
@@ skipping 104 matching lines @@
 AndroidTextureBuffer::NativeToI420Buffer() {
   int uv_width = (width()+7) / 8;
   int stride = 8 * uv_width;
   int uv_height = (height()+1)/2;
   size_t size = stride * (height() + uv_height);
   // The data is owned by the frame, and the normal case is that the
   // data is deleted by the frame's destructor callback.
   //
   // TODO(nisse): Use an I420BufferPool. We then need to extend that
   // class, and I420Buffer, to support our memory layout.
-  // TODO(nisse): Depending on
-  // system_wrappers/include/aligned_malloc.h violate current DEPS
-  // rules. We get away for now only because it is indirectly included
-  // by i420_buffer.h
   std::unique_ptr<uint8_t, webrtc::AlignedFreeDeleter> yuv_data(
       static_cast<uint8_t*>(webrtc::AlignedMalloc(size, kBufferAlignment)));
   // See YuvConverter.java for the required layout.
   uint8_t* y_data = yuv_data.get();
   uint8_t* u_data = y_data + height() * stride;
   uint8_t* v_data = u_data + stride/2;
 
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> copy =
     new rtc::RefCountedObject<webrtc::WrappedI420Buffer>(
         width(), height(),
@@ skipping 51 matching lines @@
         cropped_width / static_cast<float>(width()),
         cropped_height / static_cast<float>(height()),
         crop_x / static_cast<float>(width()),
         crop_y / static_cast<float>(height()));
   }
   buffer->native_handle_.sampling_matrix.Rotate(rotation);
   return buffer;
 }
 
 }  // namespace webrtc_jni