| Index: 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 9522a87fa5fbb82b3a1e00738ac71c424e075412..b0f9c734674c2644c898adb1132bffaf7f726be8 100644
 | 
| --- a/webrtc/api/java/jni/androidmediaencoder_jni.cc
 | 
| +++ b/webrtc/api/java/jni/androidmediaencoder_jni.cc
 | 
| @@ -674,11 +674,11 @@ int32_t MediaCodecVideoEncoder::EncodeOnCodecThread(
 | 
|          scaled_resolution.height != frame.height()) {
 | 
|        if (frame.video_frame_buffer()->native_handle() != nullptr) {
 | 
|          rtc::scoped_refptr<webrtc::VideoFrameBuffer> scaled_buffer(
 | 
| -            static_cast<AndroidTextureBuffer*>(
 | 
| -                frame.video_frame_buffer().get())->CropScaleAndRotate(
 | 
| -                    frame.width(), frame.height(),
 | 
| -                    scaled_resolution.width, scaled_resolution.height,
 | 
| -                    webrtc::kVideoRotation_0));
 | 
| +            static_cast<AndroidTextureBuffer*>(frame.video_frame_buffer().get())
 | 
| +                ->CropScaleAndRotate(frame.width(), frame.height(), 0, 0,
 | 
| +                                     scaled_resolution.width,
 | 
| +                                     scaled_resolution.height,
 | 
| +                                     webrtc::kVideoRotation_0));
 | 
|          input_frame.set_video_frame_buffer(scaled_buffer);
 | 
|        } else {
 | 
|          input_frame = quality_scaler_.GetScaledFrame(frame);
 | 
| @@ -810,7 +810,8 @@ bool MediaCodecVideoEncoder::EncodeTextureOnCodecThread(JNIEnv* jni,
 | 
|    NativeHandleImpl* handle = static_cast<NativeHandleImpl*>(
 | 
|        frame.video_frame_buffer()->native_handle());
 | 
|    jfloatArray sampling_matrix = jni->NewFloatArray(16);
 | 
| -  jni->SetFloatArrayRegion(sampling_matrix, 0, 16, handle->sampling_matrix);
 | 
| +  jni->SetFloatArrayRegion(sampling_matrix, 0, 16,
 | 
| +                           handle->sampling_matrix.elem);
 | 
|  
 | 
|    bool encode_status = jni->CallBooleanMethod(*j_media_codec_video_encoder_,
 | 
|                                                j_encode_texture_method_,
 | 
| 
 |