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

Unify hardware and software QP thresholds.

Browse Source 
Uses current libvpx (slightly older) thresholds to maintain a larger
window of stable QP, but maintains the newer H264 thresholds.

BUG=
R=glaznev@webrtc.org, mflodman@webrtc.org

Review-Url: https://codereview.webrtc.org/1966213002
Cr-Commit-Position: refs/heads/master@{#12734}
This commit is contained in:
pbos
2016-05-13 11:05:35 -07:00
committed by Commit bot
parent fb1dd43ac1
commit 1f53452ca6
4 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/api/java/jni/androidmediaencoder_jni.cc
View File

@ -388,21 +388,13 @@ int32_t MediaCodecVideoEncoder::InitEncode(
if (scale_) {
if (codecType_ == kVideoCodecVP8) {
// QP is obtained from VP8-bitstream for HW, so the QP corresponds to the
// (internal) range: [0, 127]. And we cannot change QP_max in HW, so it is
// always = 127. Note that in SW, QP is that of the user-level range [0,
// 63].
const int kLowQpThreshold = 29;
const int kBadQpThreshold = 90;
quality_scaler_.Init(kLowQpThreshold, kBadQpThreshold,
codec_settings->startBitrate, codec_settings->width,
codec_settings->height,
codec_settings->maxFramerate);
quality_scaler_.Init(
QualityScaler::kLowVp8QpThreshold, QualityScaler::kBadVp8QpThreshold,
codec_settings->startBitrate, codec_settings->width,
codec_settings->height, codec_settings->maxFramerate);
} else if (codecType_ == kVideoCodecH264) {
// H264 QP is in the range [0, 51].
const int kLowQpThreshold = 22;
const int kBadQpThreshold = 35;
quality_scaler_.Init(kLowQpThreshold, kBadQpThreshold,
quality_scaler_.Init(QualityScaler::kLowH264QpThreshold,
QualityScaler::kBadH264QpThreshold,
codec_settings->startBitrate, codec_settings->width,
codec_settings->height,
codec_settings->maxFramerate);