commit a3002db8d63aecd2a3ccf630afef9a868e7e1f78
author Magnus Jedvert <magjed@webrtc.org> Fri May 13 12:51:04 2016 +0200
committer Magnus Jedvert <magjed@webrtc.org> Fri May 13 10:51:13 2016 +0000
tree 44f56c9623bb6b2b14028482a617a11d73deb6e2
parent 834a6ea12bcd65e79c39a8a5cb5e1cd9e13b2ca0

Android: Add support for cropping textures

BUG=b/28622232
R=glaznev@webrtc.org, nisse@webrtc.org

Review URL: https://codereview.webrtc.org/1965953003 .

Cr-Commit-Position: refs/heads/master@{#12720}

webrtc/api/java/jni/androidmediaencoder_jni.cc

diff --git a/webrtc/api/java/jni/androidmediaencoder_jni.cc b/webrtc/api/java/jni/androidmediaencoder_jni.cc
index 5a817b6..8e9bfa3 100644
--- a/webrtc/api/java/jni/androidmediaencoder_jni.cc
+++ b/webrtc/api/java/jni/androidmediaencoder_jni.cc
@@ -683,9 +683,9 @@
       if (frame.video_frame_buffer()->native_handle() != nullptr) {
         rtc::scoped_refptr<webrtc::VideoFrameBuffer> scaled_buffer(
             static_cast<AndroidTextureBuffer*>(
-                frame.video_frame_buffer().get())->ScaleAndRotate(
-                    scaled_resolution.width,
-                    scaled_resolution.height,
+                frame.video_frame_buffer().get())->CropScaleAndRotate(
+                    frame.width(), frame.height(),
+                    scaled_resolution.width, scaled_resolution.height,
                     webrtc::kVideoRotation_0));
         input_frame.set_video_frame_buffer(scaled_buffer);
       } else {