| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |    2  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 
|    3  * |    3  * | 
|    4  *  Use of this source code is governed by a BSD-style license |    4  *  Use of this source code is governed by a BSD-style license | 
|    5  *  that can be found in the LICENSE file in the root of the source |    5  *  that can be found in the LICENSE file in the root of the source | 
|    6  *  tree. An additional intellectual property rights grant can be found |    6  *  tree. An additional intellectual property rights grant can be found | 
|    7  *  in the file PATENTS.  All contributing project authors may |    7  *  in the file PATENTS.  All contributing project authors may | 
|    8  *  be found in the AUTHORS file in the root of the source tree. |    8  *  be found in the AUTHORS file in the root of the source tree. | 
|    9  */ |    9  */ | 
|   10 #include <stdio.h> |   10 #include <stdio.h> | 
| (...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  504                                       DefaultVideoStream(video_params_high)}; |  504                                       DefaultVideoStream(video_params_high)}; | 
|  505   large_room.num_thumbnails = 5; |  505   large_room.num_thumbnails = 5; | 
|  506   large_room.ss = {streams, 2, 1, 0}; |  506   large_room.ss = {streams, 2, 1, 0}; | 
|  507   RunTest(large_room); |  507   RunTest(large_room); | 
|  508 } |  508 } | 
|  509  |  509  | 
|  510 #if defined(WEBRTC_ANDROID) || defined(WEBRTC_WIN) |  510 #if defined(WEBRTC_ANDROID) || defined(WEBRTC_WIN) | 
|  511 // Fails on Android and win: |  511 // Fails on Android and win: | 
|  512 // https://bugs.chromium.org/p/webrtc/issues/detail?id=7301 |  512 // https://bugs.chromium.org/p/webrtc/issues/detail?id=7301 | 
|  513 #define MAYBE_LargeRoomVP8_50thumb DISABLED_LargeRoomVP8_50thumb |  513 #define MAYBE_LargeRoomVP8_50thumb DISABLED_LargeRoomVP8_50thumb | 
 |  514 #define MAYBE_LargeRoomVP8_15thumb DISABLED_LargeRoomVP8_15thumb | 
|  514 #else |  515 #else | 
|  515 #define MAYBE_LargeRoomVP8_50thumb LargeRoomVP8_50thumb |  516 #define MAYBE_LargeRoomVP8_50thumb LargeRoomVP8_50thumb | 
 |  517 #define MAYBE_LargeRoomVP8_15thumb LargeRoomVP8_15thumb | 
|  516 #endif |  518 #endif | 
|  517  |  519  | 
|  518 TEST_F(FullStackTest, MAYBE_LargeRoomVP8_15thumb) { |  520 TEST_F(FullStackTest, MAYBE_LargeRoomVP8_15thumb) { | 
|  519   VideoQualityTest::Params large_room; |  521   VideoQualityTest::Params large_room; | 
|  520   large_room.call.send_side_bwe = true; |  522   large_room.call.send_side_bwe = true; | 
|  521   large_room.video = kSimulcastVp8VideoHigh; |  523   large_room.video = kSimulcastVp8VideoHigh; | 
|  522   large_room.analyzer = {"largeroom_15thumb", 0.0, 0.0, |  524   large_room.analyzer = {"largeroom_15thumb", 0.0, 0.0, | 
|  523                          kFullStackTestDurationSecs}; |  525                          kFullStackTestDurationSecs}; | 
|  524   large_room.pipe.loss_percent = 0; |  526   large_room.pipe.loss_percent = 0; | 
|  525   large_room.pipe.queue_delay_ms = 100; |  527   large_room.pipe.queue_delay_ms = 100; | 
| (...skipping 30 matching lines...) Expand all  Loading... | 
|  556   std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), |  558   std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), | 
|  557                                       DefaultVideoStream(video_params_medium), |  559                                       DefaultVideoStream(video_params_medium), | 
|  558                                       DefaultVideoStream(video_params_high)}; |  560                                       DefaultVideoStream(video_params_high)}; | 
|  559   large_room.num_thumbnails = 50; |  561   large_room.num_thumbnails = 50; | 
|  560   large_room.ss = {streams, 2, 1, 0}; |  562   large_room.ss = {streams, 2, 1, 0}; | 
|  561   RunTest(large_room); |  563   RunTest(large_room); | 
|  562 } |  564 } | 
|  563  |  565  | 
|  564  |  566  | 
|  565 }  // namespace webrtc |  567 }  // namespace webrtc | 
| OLD | NEW |