Roll chromium_revision 22b81f6c45..d604de96c9 (459032:459307)

webrtc/video/full_stack_tests.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include <stdio.h>
@@ skipping 381 matching lines @@
     "VP8",  3,      2,      400000,
     false,  false,  "",     "ConferenceMotion_1280_720_50"};
 
 const VideoQualityTest::Params::Video kSimulcastVp8VideoLow = {
     true,  320,    180,    30,
     30000, 150000, 200000, false,
     "VP8", 3,      2,      400000,
     false, false,  "",     "ConferenceMotion_1280_720_50"};
 
 #if !defined(RTC_DISABLE_VP9)
-TEST_F(FullStackTest, ScreenshareSlidesVP9_2SL) {
+// Disabled due to crash on Linux, Win and Android, see bugs.webrtc.org/7401.
+#if defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) || defined(WEBRTC_WIN)
+#define MAYBE_ScreenshareSlidesVP9_2SL DISABLED_ScreenshareSlidesVP9_2SL
+#else
+#define MAYBE_ScreenshareSlidesVP9_2SL ScreenshareSlidesVP9_2SL
+#endif
+TEST_F(FullStackTest, MAYBE_ScreenshareSlidesVP9_2SL) {
   VideoQualityTest::Params screenshare;
   screenshare.call.send_side_bwe = true;
   screenshare.video = {true, 1850, 1110, 5, 50000, 200000, 2000000, false,
                        "VP9", 1, 0, 400000, false, false, "", ""};
   screenshare.screenshare = {true, 10};
   screenshare.analyzer = {"screenshare_slides_vp9_2sl", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   screenshare.logs = false;
   screenshare.ss = {std::vector<VideoStream>(), 0, 2, 1};
   RunTest(screenshare);
@@ skipping 172 matching lines @@
   std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low),
                                       DefaultVideoStream(video_params_medium),
                                       DefaultVideoStream(video_params_high)};
   large_room.num_thumbnails = 50;
   large_room.ss = {streams, 2, 1, 0};
   RunTest(large_room);
 }
 
 
 }  // namespace webrtc