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

Increase speed setting for VP9 (from 5 to 6) and re-enable end_to_end test.

Browse Source 
TBR=stefan@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7637 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
marpan@webrtc.org 2014-11-06 02:02:28 +00:00
parent ee9d61ce45
commit 5f1e2e42a8
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -604,7 +604,7 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossVP9) {
false, true, false);
// Metrics for expected quality.
QualityMetrics quality_metrics;
SetQualityMetrics(&quality_metrics, 37.5, 36.0, 0.94, 0.93);
SetQualityMetrics(&quality_metrics, 37.0, 36.0, 0.93, 0.92);
// Metrics for rate control.
RateControlMetrics rc_metrics[1];
SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 15, 0);
@ -657,7 +657,7 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) {
false, true, false);
// Metrics for expected quality.
QualityMetrics quality_metrics;
SetQualityMetrics(&quality_metrics, 36.0, 32.0, 0.90, 0.85);
SetQualityMetrics(&quality_metrics, 36.0, 31.8, 0.90, 0.85);
// Metrics for rate control.
RateControlMetrics rc_metrics[3];
SetRateControlMetrics(rc_metrics, 0, 0, 30, 20, 20, 20, 0);
@ -692,11 +692,11 @@ TEST_F(VideoProcessorIntegrationTest,
false, true, false);
// Metrics for expected quality.
QualityMetrics quality_metrics;
SetQualityMetrics(&quality_metrics, 30.0, 18.0, 0.80, 0.40);
SetQualityMetrics(&quality_metrics, 29.0, 17.0, 0.80, 0.40);
// Metrics for rate control.
RateControlMetrics rc_metrics[3];
SetRateControlMetrics(rc_metrics, 0, 35, 55, 70, 15, 40, 0);
SetRateControlMetrics(rc_metrics, 1, 15, 0, 50, 10, 30, 0);
SetRateControlMetrics(rc_metrics, 0, 50, 60, 100, 15, 45, 0);
SetRateControlMetrics(rc_metrics, 1, 30, 0, 65, 10, 35, 0);
SetRateControlMetrics(rc_metrics, 2, 5, 0, 38, 10, 30, 0);
ProcessFramesAndVerify(quality_metrics,
rate_profile,

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

@ -189,11 +189,8 @@ int VP9EncoderImpl::InitAndSetControlSettings(const VideoCodec* inst) {
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
}
// Only positive speeds, currently: 0 - 7.
// O means slowest/best quality, 7 means fastest/lowest quality.
// TODO(marpan): Speeds 5-7 are speed settings for real-time mode, on desktop.
// Currently set to 5, update to 6 (for faster encoding) after some subjective
// quality tests.
cpu_speed_ = 5;
// O means slowest/best quality, 7 means fastest/lower quality.
cpu_speed_ = 6;
// 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_);

3
webrtc/video/end_to_end_tests.cc
View File

@ -225,8 +225,7 @@ TEST_F(EndToEndTest, TransmitsFirstFrame) {
DestroyStreams();
}
// TODO(marpan): Re-enable this test on the next libvpx roll.
TEST_F(EndToEndTest, DISABLED_SendsAndReceivesVP9) {
TEST_F(EndToEndTest, SendsAndReceivesVP9) {
class VP9Observer : public test::EndToEndTest, public VideoRenderer {
public:
VP9Observer()