diff options
| author | perkj <perkj@webrtc.org> | 2015-10-13 14:03:56 +0200 |
|---|---|---|
| committer | perkj <perkj@webrtc.org> | 2015-10-13 12:04:08 +0000 |
| commit | ec93628e75fdb81f23635b39b5f3da846bcefd21 (patch) | |
| tree | 0107ca9727d290d57acaa8de9a19a7a43b9130b5 /talk | |
| parent | 1ac561447e3e1d81a1e390f95a385b5ed8fe0932 (diff) | |
| download | webrtc-ec93628e75fdb81f23635b39b5f3da846bcefd21.tar.gz | |
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}
Diffstat (limited to 'talk')
| -rw-r--r-- | talk/app/webrtc/java/jni/androidmediaencoder_jni.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |