From 09b38f3ca055100f38ddc3280a21febb4bac9797 Mon Sep 17 00:00:00 2001
From: Marco <marpan@chromium.org>
Date: Mon, 26 Oct 2015 08:22:31 -0700
Subject: [PATCH] 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}
---
 .../codecs/test/videoprocessor_integrationtest.cc  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
index 6eaea8b869..3d6aedb22a 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.