commit ae1bceab00ebef86c10bd557738e083e86d6b464
author Sami Kalliomäki <sakal@webrtc.org> Tue Jul 24 16:59:05 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Wed Jul 25 08:37:47 2018 +0000
tree d0135e836d946acb3f1816a94a2fac187cdced9b
parent 8f6fe585b2b30ebf73fd8b1dcb391adbc9df973b

Move cropAndScaleI420 to JavaI420Buffer.

This allows removing JavaI420Buffer from video_api. This is technically
a public method but I don't think anyone is using it so it should be
safe to move.

Bug: webrtc:9048
Change-Id: Id563a3af030497e1a92e09da79ca1ed925e064a3
Reviewed-on: https://webrtc-review.googlesource.com/90250
Reviewed-by: Paulina Hensman <phensman@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24090}

sdk/android/BUILD.gn

diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 0969637..c6839fa 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -229,9 +229,6 @@
       "api/org/webrtc/VideoSink.java",
     ]
 
-    # TODO(sakal): These should be moved to video_java but cannot because of dependencies.
-    java_files += [ "api/org/webrtc/JavaI420Buffer.java" ]
-
     deps = [
       ":base_java",
       "//rtc_base:base_java",
@@ -246,6 +243,7 @@
       "api/org/webrtc/GlShader.java",
       "api/org/webrtc/GlTextureFrameBuffer.java",
       "api/org/webrtc/GlUtil.java",
+      "api/org/webrtc/JavaI420Buffer.java",
       "api/org/webrtc/RendererCommon.java",
       "api/org/webrtc/SurfaceTextureHelper.java",
       "api/org/webrtc/TextureBufferImpl.java",
@@ -529,6 +527,7 @@
       "src/jni/encodedimage.cc",
       "src/jni/encodedimage.h",
       "src/jni/h264utils.cc",
+      "src/jni/javai420buffer.cc",
       "src/jni/jni_generator_helper.h",
       "src/jni/nativecapturerobserver.cc",
       "src/jni/nativecapturerobserver.h",
@@ -923,8 +922,6 @@
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
-      "../../rtc_base/memory:aligned_malloc",
-      "//third_party/libyuv",
     ]
   }
 
@@ -1110,6 +1107,7 @@
   generate_jni("generated_video_jni") {
     sources = [
       "api/org/webrtc/EncodedImage.java",
+      "api/org/webrtc/JavaI420Buffer.java",
       "api/org/webrtc/MediaCodecVideoDecoder.java",
       "api/org/webrtc/MediaCodecVideoEncoder.java",
       "api/org/webrtc/VideoCodecInfo.java",