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 6a1c58110777f2d43a3513c5c645259af3668441..89ab7a12fb3817a5029950e8108993408d8a3803 100644 |
--- a/webrtc/api/java/jni/androidmediaencoder_jni.cc |
+++ b/webrtc/api/java/jni/androidmediaencoder_jni.cc |
@@ -676,7 +676,7 @@ int32_t MediaCodecVideoEncoder::EncodeOnCodecThread( |
rtc::scoped_refptr<webrtc::VideoFrameBuffer> scaled_buffer( |
static_cast<AndroidTextureBuffer*>( |
frame.video_frame_buffer().get())->CropScaleAndRotate( |
- frame.width(), frame.height(), |
+ frame.width(), frame.height(), 0, 0, |
scaled_resolution.width, scaled_resolution.height, |
webrtc::kVideoRotation_0)); |
input_frame.set_video_frame_buffer(scaled_buffer); |
@@ -812,9 +812,7 @@ bool MediaCodecVideoEncoder::EncodeTextureOnCodecThread(JNIEnv* jni, |
RTC_CHECK(use_surface_); |
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); |
- |
+ jfloatArray sampling_matrix = handle->sampling_matrix.ToJava(jni); |
bool encode_status = jni->CallBooleanMethod(*j_media_codec_video_encoder_, |
j_encode_texture_method_, |
key_frame, |