From e2b34b7b4b540c4d92397c20990b7c5dbf64bbc3 Mon Sep 17 00:00:00 2001 From: jackychen Date: Fri, 24 Jul 2015 14:12:24 -0700 Subject: [PATCH] Bug fix: camera frames are dropped before wideo encoder. https://code.google.com/p/webrtc/issues/detail?id=4871 R=glaznev@webrtc.org TBR=glaznev@webrtc.org Review URL: https://codereview.webrtc.org/1260543002 . Cr-Commit-Position: refs/heads/master@{#9634} --- talk/app/webrtc/java/jni/androidmediaencoder_jni.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc index 25ffe91586..8c00bc3f51 100644 --- a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc +++ b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc @@ -301,8 +301,10 @@ int32_t MediaCodecVideoEncoder::InitEncode( quality_scaler_->Init(kMaxQP / kLowQpThresholdDenominator, true); quality_scaler_->SetMinResolution(kMinWidth, kMinHeight); quality_scaler_->ReportFramerate(codec_settings->maxFramerate); + updated_framerate_ = codec_settings->maxFramerate; + } else { + updated_framerate_ = -1; } - updated_framerate_ = codec_settings->maxFramerate; return codec_thread_->Invoke( Bind(&MediaCodecVideoEncoder::InitEncodeOnCodecThread, this, @@ -343,8 +345,6 @@ int32_t MediaCodecVideoEncoder::SetRates(uint32_t new_bit_rate, uint32_t frame_rate) { if (scale_ && codecType_ == kVideoCodecVP8) { quality_scaler_->ReportFramerate(frame_rate); - } else { - updated_framerate_ = frame_rate; } return codec_thread_->Invoke( Bind(&MediaCodecVideoEncoder::SetRatesOnCodecThread,