diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc index ecf1c8338f..6c0e1254fc 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc @@ -691,11 +691,11 @@ TEST_F(VideoProcessorIntegrationTest, false, true, false); // Metrics for expected quality. 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. RateControlMetrics rc_metrics[3]; 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); ProcessFramesAndVerify(quality_metrics, rate_profile, diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc b/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc index a6a7ecd4e0..310e53af5e 100644 --- a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc +++ b/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc @@ -209,9 +209,9 @@ int VP9EncoderImpl::InitAndSetControlSettings(const VideoCodec* inst) { if (vpx_codec_enc_init(encoder_, vpx_codec_vp9_cx(), config_, 0)) { return WEBRTC_VIDEO_CODEC_UNINITIALIZED; } - // Only positive speeds, currently: 0 - 7. - // O means slowest/best quality, 7 means fastest/lower quality. - cpu_speed_ = 6; + // Only positive speeds, currently: 0 - 8. + // O means slowest/best quality, 8 means fastest/lower quality. + cpu_speed_ = 7; // Note: some of these codec controls still use "VP8" in the control name. // TODO(marpan): Update this in the next/future libvpx version. vpx_codec_control(encoder_, VP8E_SET_CPUUSED, cpu_speed_);