Index: webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc |
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc |
index d9148d6b67a199d1f89d924993b9868221a2559b..6ea847c641095467c8432ea74db43e40f052a3b0 100644 |
--- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc |
+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc |
@@ -728,10 +728,13 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) { |
} |
// Run with no packet loss, at low bitrate. |
-// spatial_resize is on, so expect one resize during the sequence, |
-// resize happens on delta frame. Expect only one key frame (first frame). |
-TEST_F(VideoProcessorIntegrationTest, |
- DISABLED_ProcessNoLossSpatialResizeFrameDropVP9) { |
+// spatial_resize is on, and for this low bitrate expect two resizes during the |
+// sequence; first resize is 3/4, second is 1/2 (from original). |
+// Resize happens on delta frame. Expect only one key frame (first frame). |
+// 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; |
// Bitrate and frame rate profile. |
RateProfile rate_profile; |
@@ -747,12 +750,13 @@ TEST_F(VideoProcessorIntegrationTest, |
SetQualityMetrics(&quality_metrics, 25.0, 13.0, 0.70, 0.40); |
// Metrics for rate control. |
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, |
rate_profile, |
process_settings, |
rc_metrics); |
} |
+#endif |
// TODO(marpan): Add temporal layer test for VP9, once changes are in |
// vp9 wrapper for this. |