Adjust qp-max settinhg in VP9 wrapper.

More closely matches the qp-max setting used in VP8.

TBR=stefan@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/39709004

Cr-Commit-Position: refs/heads/master@{#8177}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8177 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
marpan@webrtc.org 2015-01-27 23:08:24 +00:00
parent 922cfcd150
commit dc8a9da386
2 changed files with 5 additions and 5 deletions

View File

@ -659,7 +659,7 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) {
SetQualityMetrics(&quality_metrics, 35.9, 32.0, 0.90, 0.85);
// Metrics for rate control.
RateControlMetrics rc_metrics[3];
SetRateControlMetrics(rc_metrics, 0, 0, 30, 20, 20, 20, 0);
SetRateControlMetrics(rc_metrics, 0, 0, 30, 20, 20, 25, 0);
SetRateControlMetrics(rc_metrics, 1, 2, 0, 20, 20, 60, 0);
SetRateControlMetrics(rc_metrics, 2, 0, 0, 25, 20, 40, 0);
ProcessFramesAndVerify(quality_metrics,
@ -680,9 +680,9 @@ TEST_F(VideoProcessorIntegrationTest,
config_.networking_config.packet_loss_probability = 0;
// Bitrate and frame rate profile.
RateProfile rate_profile;
SetRateProfilePars(&rate_profile, 0, 80, 24, 0);
SetRateProfilePars(&rate_profile, 1, 80, 15, 100);
SetRateProfilePars(&rate_profile, 2, 80, 10, 200);
SetRateProfilePars(&rate_profile, 0, 100, 24, 0);
SetRateProfilePars(&rate_profile, 1, 100, 15, 100);
SetRateProfilePars(&rate_profile, 2, 100, 10, 200);
rate_profile.frame_index_rate_update[3] = kNbrFramesLong + 1;
rate_profile.num_frames = kNbrFramesLong;
// Codec/network settings.

View File

@ -167,7 +167,7 @@ int VP9EncoderImpl::InitEncode(const VideoCodec* inst,
config_->rc_end_usage = VPX_CBR;
config_->g_pass = VPX_RC_ONE_PASS;
config_->rc_min_quantizer = 2;
config_->rc_max_quantizer = 56;
config_->rc_max_quantizer = 52;
config_->rc_undershoot_pct = 50;
config_->rc_overshoot_pct = 50;
config_->rc_buf_initial_sz = 500;