| 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 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 527 video_params_low.video = kSimulcastVp8VideoLow; | 527 video_params_low.video = kSimulcastVp8VideoLow; |
| 528 | 528 |
| 529 std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), | 529 std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), |
| 530 DefaultVideoStream(video_params_medium), | 530 DefaultVideoStream(video_params_medium), |
| 531 DefaultVideoStream(video_params_high)}; | 531 DefaultVideoStream(video_params_high)}; |
| 532 large_room.num_thumbnails = 5; | 532 large_room.num_thumbnails = 5; |
| 533 large_room.ss = {streams, 2, 1, 0}; | 533 large_room.ss = {streams, 2, 1, 0}; |
| 534 RunTest(large_room); | 534 RunTest(large_room); |
| 535 } | 535 } |
| 536 | 536 |
| 537 #if defined(WEBRTC_ANDROID) | 537 #if defined(WEBRTC_ANDROID) || defined(WEBRTC_WIN) |
| 538 // Fails on Android: | 538 // Fails on Android and win: |
| 539 // https://bugs.chromium.org/p/webrtc/issues/detail?id=7301 | 539 // https://bugs.chromium.org/p/webrtc/issues/detail?id=7301 |
| 540 #define MAYBE_LargeRoomVP8_50thumb DISABLED_LargeRoomVP8_50thumb | 540 #define MAYBE_LargeRoomVP8_50thumb DISABLED_LargeRoomVP8_50thumb |
| 541 #define MAYBE_LargeRoomVP8_15thumb DISABLED_LargeRoomVP8_15thumb | 541 #define MAYBE_LargeRoomVP8_15thumb DISABLED_LargeRoomVP8_15thumb |
| 542 #else | 542 #else |
| 543 #define MAYBE_LargeRoomVP8_50thumb LargeRoomVP8_50thumb | 543 #define MAYBE_LargeRoomVP8_50thumb LargeRoomVP8_50thumb |
| 544 #define MAYBE_LargeRoomVP8_15thumb LargeRoomVP8_15thumb | 544 #define MAYBE_LargeRoomVP8_15thumb LargeRoomVP8_15thumb |
| 545 #endif | 545 #endif |
| 546 | 546 |
| 547 TEST_F(FullStackTest, MAYBE_LargeRoomVP8_15thumb) { | 547 TEST_F(FullStackTest, MAYBE_LargeRoomVP8_15thumb) { |
| 548 VideoQualityTest::Params large_room; | 548 VideoQualityTest::Params large_room; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), | 585 std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), |
| 586 DefaultVideoStream(video_params_medium), | 586 DefaultVideoStream(video_params_medium), |
| 587 DefaultVideoStream(video_params_high)}; | 587 DefaultVideoStream(video_params_high)}; |
| 588 large_room.num_thumbnails = 50; | 588 large_room.num_thumbnails = 50; |
| 589 large_room.ss = {streams, 2, 1, 0}; | 589 large_room.ss = {streams, 2, 1, 0}; |
| 590 RunTest(large_room); | 590 RunTest(large_room); |
| 591 } | 591 } |
| 592 | 592 |
| 593 | 593 |
| 594 } // namespace webrtc | 594 } // namespace webrtc |
| OLD | NEW |