| 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 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 458 simulcast.video = kSvcVp9Video; | 458 simulcast.video = kSvcVp9Video; |
| 459 simulcast.analyzer = {"vp9svc_3sl_low", 0.0, 0.0, kFullStackTestDurationSecs}; | 459 simulcast.analyzer = {"vp9svc_3sl_low", 0.0, 0.0, kFullStackTestDurationSecs}; |
| 460 simulcast.logs = false; | 460 simulcast.logs = false; |
| 461 simulcast.ss = {std::vector<VideoStream>(), 0, 3, 0, | 461 simulcast.ss = {std::vector<VideoStream>(), 0, 3, 0, |
| 462 std::vector<SpatialLayer>(), false}; | 462 std::vector<SpatialLayer>(), false}; |
| 463 RunTest(simulcast); | 463 RunTest(simulcast); |
| 464 } | 464 } |
| 465 #endif // !defined(RTC_DISABLE_VP9) | 465 #endif // !defined(RTC_DISABLE_VP9) |
| 466 | 466 |
| 467 // Android bots can't handle FullHD, so disable the test. | 467 // Android bots can't handle FullHD, so disable the test. |
| 468 #if defined(WEBRTC_ANDROID) | 468 // Test is not working correctly on Mac: webrtc:7870. |
| 469 #if defined(WEBRTC_ANDROID) || defined(WEBRTC_MAC) |
| 469 #define MAYBE_SimulcastFullHdOveruse DISABLED_SimulcastFullHdOveruse | 470 #define MAYBE_SimulcastFullHdOveruse DISABLED_SimulcastFullHdOveruse |
| 470 #else | 471 #else |
| 471 #define MAYBE_SimulcastFullHdOveruse SimulcastFullHdOveruse | 472 #define MAYBE_SimulcastFullHdOveruse SimulcastFullHdOveruse |
| 472 #endif | 473 #endif |
| 473 | 474 |
| 474 TEST_F(FullStackTest, MAYBE_SimulcastFullHdOveruse) { | 475 TEST_F(FullStackTest, MAYBE_SimulcastFullHdOveruse) { |
| 475 VideoQualityTest::Params simulcast; | 476 VideoQualityTest::Params simulcast; |
| 476 simulcast.call.send_side_bwe = true; | 477 simulcast.call.send_side_bwe = true; |
| 477 simulcast.video = {true, 1920, 1080, 30, 800000, 2500000, | 478 simulcast.video = {true, 1920, 1080, 30, 800000, 2500000, |
| 478 2500000, false, "VP8", 3, 2, 400000, | 479 2500000, false, "VP8", 3, 2, 400000, |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), | 631 std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), |
| 631 DefaultVideoStream(video_params_medium), | 632 DefaultVideoStream(video_params_medium), |
| 632 DefaultVideoStream(video_params_high)}; | 633 DefaultVideoStream(video_params_high)}; |
| 633 large_room.num_thumbnails = 50; | 634 large_room.num_thumbnails = 50; |
| 634 large_room.ss = {streams, 2, 1, 0, std::vector<SpatialLayer>(), false}; | 635 large_room.ss = {streams, 2, 1, 0, std::vector<SpatialLayer>(), false}; |
| 635 RunTest(large_room); | 636 RunTest(large_room); |
| 636 } | 637 } |
| 637 | 638 |
| 638 | 639 |
| 639 } // namespace webrtc | 640 } // namespace webrtc |
| OLD | NEW |