| 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 761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 772 video_params_low.video = kSimulcastVp8VideoLow; | 772 video_params_low.video = kSimulcastVp8VideoLow; |
| 773 | 773 |
| 774 std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), | 774 std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), |
| 775 DefaultVideoStream(video_params_medium), | 775 DefaultVideoStream(video_params_medium), |
| 776 DefaultVideoStream(video_params_high)}; | 776 DefaultVideoStream(video_params_high)}; |
| 777 large_room.call.num_thumbnails = 5; | 777 large_room.call.num_thumbnails = 5; |
| 778 large_room.ss = {streams, 2, 1, 0, std::vector<SpatialLayer>(), false}; | 778 large_room.ss = {streams, 2, 1, 0, std::vector<SpatialLayer>(), false}; |
| 779 RunTest(large_room); | 779 RunTest(large_room); |
| 780 } | 780 } |
| 781 | 781 |
| 782 #if defined(WEBRTC_ANDROID) | 782 #if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS) |
| 783 // Fails on Android: | 783 // Fails on mobile devices: |
| 784 // https://bugs.chromium.org/p/webrtc/issues/detail?id=7301 | 784 // https://bugs.chromium.org/p/webrtc/issues/detail?id=7301 |
| 785 #define MAYBE_LargeRoomVP8_50thumb DISABLED_LargeRoomVP8_50thumb | 785 #define MAYBE_LargeRoomVP8_50thumb DISABLED_LargeRoomVP8_50thumb |
| 786 #define MAYBE_LargeRoomVP8_15thumb DISABLED_LargeRoomVP8_15thumb | 786 #define MAYBE_LargeRoomVP8_15thumb DISABLED_LargeRoomVP8_15thumb |
| 787 #else | 787 #else |
| 788 #define MAYBE_LargeRoomVP8_50thumb LargeRoomVP8_50thumb | 788 #define MAYBE_LargeRoomVP8_50thumb LargeRoomVP8_50thumb |
| 789 #define MAYBE_LargeRoomVP8_15thumb LargeRoomVP8_15thumb | 789 #define MAYBE_LargeRoomVP8_15thumb LargeRoomVP8_15thumb |
| 790 #endif | 790 #endif |
| 791 | 791 |
| 792 TEST_F(FullStackTest, MAYBE_LargeRoomVP8_15thumb) { | 792 TEST_F(FullStackTest, MAYBE_LargeRoomVP8_15thumb) { |
| 793 VideoQualityTest::Params large_room; | 793 VideoQualityTest::Params large_room; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 830 std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), | 830 std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), |
| 831 DefaultVideoStream(video_params_medium), | 831 DefaultVideoStream(video_params_medium), |
| 832 DefaultVideoStream(video_params_high)}; | 832 DefaultVideoStream(video_params_high)}; |
| 833 large_room.call.num_thumbnails = 50; | 833 large_room.call.num_thumbnails = 50; |
| 834 large_room.ss = {streams, 2, 1, 0, std::vector<SpatialLayer>(), false}; | 834 large_room.ss = {streams, 2, 1, 0, std::vector<SpatialLayer>(), false}; |
| 835 RunTest(large_room); | 835 RunTest(large_room); |
| 836 } | 836 } |
| 837 | 837 |
| 838 | 838 |
| 839 } // namespace webrtc | 839 } // namespace webrtc |
| OLD | NEW |