Re-enable VP9 resize test.

TBR=stefan@webrtc.org
BUG=webrtc:5097

Review URL: https://codereview.webrtc.org/1409143005 .

Cr-Commit-Position: refs/heads/master@{#10409}
This commit is contained in:
Marco
2015-10-26 08:22:31 -07:00
parent 7ef0553c85
commit 09b38f3ca0

View File

@ -728,10 +728,13 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) {
} }
// Run with no packet loss, at low bitrate. // Run with no packet loss, at low bitrate.
// spatial_resize is on, so expect one resize during the sequence, // spatial_resize is on, and for this low bitrate expect two resizes during the
// resize happens on delta frame. Expect only one key frame (first frame). // sequence; first resize is 3/4, second is 1/2 (from original).
TEST_F(VideoProcessorIntegrationTest, // Resize happens on delta frame. Expect only one key frame (first frame).
DISABLED_ProcessNoLossSpatialResizeFrameDropVP9) { // Disable for msan, see
// https://code.google.com/p/webrtc/issues/detail?id=5110 for details.
#if !defined(MEMORY_SANITIZER)
TEST_F(VideoProcessorIntegrationTest, ProcessNoLossSpatialResizeFrameDropVP9) {
config_.networking_config.packet_loss_probability = 0; config_.networking_config.packet_loss_probability = 0;
// Bitrate and frame rate profile. // Bitrate and frame rate profile.
RateProfile rate_profile; RateProfile rate_profile;
@ -747,12 +750,13 @@ TEST_F(VideoProcessorIntegrationTest,
SetQualityMetrics(&quality_metrics, 25.0, 13.0, 0.70, 0.40); SetQualityMetrics(&quality_metrics, 25.0, 13.0, 0.70, 0.40);
// Metrics for rate control. // Metrics for rate control.
RateControlMetrics rc_metrics[1]; RateControlMetrics rc_metrics[1];
SetRateControlMetrics(rc_metrics, 0, 170, 70, 120, 10, 80, 1, 1); SetRateControlMetrics(rc_metrics, 0, 180, 70, 130, 15, 80, 2, 1);
ProcessFramesAndVerify(quality_metrics, ProcessFramesAndVerify(quality_metrics,
rate_profile, rate_profile,
process_settings, process_settings,
rc_metrics); rc_metrics);
} }
#endif
// TODO(marpan): Add temporal layer test for VP9, once changes are in // TODO(marpan): Add temporal layer test for VP9, once changes are in
// vp9 wrapper for this. // vp9 wrapper for this.