| commit | ec93628e75fdb81f23635b39b5f3da846bcefd21 | [log] [tgz] |
|---|---|---|
| author | perkj <perkj@webrtc.org> | Tue Oct 13 14:03:56 2015 +0200 |
| committer | perkj <perkj@webrtc.org> | Tue Oct 13 12:04:08 2015 +0000 |
| tree | 0107ca9727d290d57acaa8de9a19a7a43b9130b5 | |
| parent | 1ac561447e3e1d81a1e390f95a385b5ed8fe0932 [diff] |
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}
diff --git a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc index 8fcc20b..246773c 100644 --- a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc +++ b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
@@ -543,7 +543,7 @@ 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; }