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}
diff --git a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
index 25ffe91..8c00bc3 100644
--- a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
+++ b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
@@ -301,8 +301,10 @@
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<int32_t>(
Bind(&MediaCodecVideoEncoder::InitEncodeOnCodecThread,
this,
@@ -343,8 +345,6 @@
uint32_t frame_rate) {
if (scale_ && codecType_ == kVideoCodecVP8) {
quality_scaler_->ReportFramerate(frame_rate);
- } else {
- updated_framerate_ = frame_rate;
}
return codec_thread_->Invoke<int32_t>(
Bind(&MediaCodecVideoEncoder::SetRatesOnCodecThread,