From ec93628e75fdb81f23635b39b5f3da846bcefd21 Mon Sep 17 00:00:00 2001 From: perkj Date: Tue, 13 Oct 2015 14:03:56 +0200 Subject: [PATCH] Fix use of scaler in MediaCodecVideoEncoder This bug fixes an issue introduced in https://codereview.webrtc.org/1396073003/ BUG=webrtc:5067 TEST= set new_bit_rate = 200 in MediaCodecVideoEncoder::SetRatesOnCodecThread and compile and run ApprtDemo R=magjed@webrtc.org Review URL: https://codereview.webrtc.org/1401943002 . Cr-Commit-Position: refs/heads/master@{#10263} --- talk/app/webrtc/java/jni/androidmediaencoder_jni.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc index 8fcc20b6f1..246773c2bb 100644 --- a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc +++ b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc @@ -543,7 +543,7 @@ int32_t MediaCodecVideoEncoder::EncodeOnCodecThread( const VideoFrame& input_frame = scale_ ? quality_scaler_.GetScaledFrame(frame) : frame; - if (!MaybeReconfigureEncoderOnCodecThread(frame)) { + if (!MaybeReconfigureEncoderOnCodecThread(input_frame)) { ALOGE << "Failed to reconfigure encoder."; return WEBRTC_VIDEO_CODEC_ERROR; }