generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update speed setting in VP9.

Browse Source 
TBR=stefan@webrtc.org
BUG=

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

Cr-Commit-Position: refs/heads/master@{#8870}
This commit is contained in:
Marco 2015-03-26 13:20:25 -07:00
parent 74d9ed7d85
commit b8cfa68323
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
View File

@ -691,11 +691,11 @@ TEST_F(VideoProcessorIntegrationTest,
false, true, false); false, true, false);
// Metrics for expected quality. // Metrics for expected quality.
QualityMetrics quality_metrics; QualityMetrics quality_metrics;
SetQualityMetrics(&quality_metrics, 31.5, 18.0, 0.80, 0.45); SetQualityMetrics(&quality_metrics, 31.5, 18.0, 0.80, 0.44);
// Metrics for rate control. // Metrics for rate control.
RateControlMetrics rc_metrics[3]; RateControlMetrics rc_metrics[3];
SetRateControlMetrics(rc_metrics, 0, 35, 50, 70, 15, 45, 0); SetRateControlMetrics(rc_metrics, 0, 35, 50, 70, 15, 45, 0);
SetRateControlMetrics(rc_metrics, 1, 10, 0, 30, 10, 30, 0); SetRateControlMetrics(rc_metrics, 1, 10, 0, 40, 10, 30, 0);
SetRateControlMetrics(rc_metrics, 2, 5, 0, 30, 5, 20, 0); SetRateControlMetrics(rc_metrics, 2, 5, 0, 30, 5, 20, 0);
ProcessFramesAndVerify(quality_metrics, ProcessFramesAndVerify(quality_metrics,
rate_profile, rate_profile,

6
webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc
View File

@ -209,9 +209,9 @@ int VP9EncoderImpl::InitAndSetControlSettings(const VideoCodec* inst) {
if (vpx_codec_enc_init(encoder_, vpx_codec_vp9_cx(), config_, 0)) { if (vpx_codec_enc_init(encoder_, vpx_codec_vp9_cx(), config_, 0)) {
return WEBRTC_VIDEO_CODEC_UNINITIALIZED; return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
} }
// Only positive speeds, currently: 0 - 7. // Only positive speeds, currently: 0 - 8.
// O means slowest/best quality, 7 means fastest/lower quality. // O means slowest/best quality, 8 means fastest/lower quality.
cpu_speed_ = 6; cpu_speed_ = 7;
// Note: some of these codec controls still use "VP8" in the control name. // Note: some of these codec controls still use "VP8" in the control name.
// TODO(marpan): Update this in the next/future libvpx version. // TODO(marpan): Update this in the next/future libvpx version.
vpx_codec_control(encoder_, VP8E_SET_CPUUSED, cpu_speed_); vpx_codec_control(encoder_, VP8E_SET_CPUUSED, cpu_speed_);