zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix: camera frames are dropped before wideo encoder.

Browse Source 
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}
This commit is contained in:
jackychen
2015-07-24 14:12:24 -07:00
parent 6bb1b6e7fe
commit e2b34b7b4b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
View File

@ -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<int32_t>(
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<int32_t>(
Bind(&MediaCodecVideoEncoder::SetRatesOnCodecThread,