| 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 <algorithm> // max | 10 #include <algorithm> // max |
| (...skipping 1672 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1683 | 1683 |
| 1684 void PerformTest() override { | 1684 void PerformTest() override { |
| 1685 EXPECT_TRUE(Wait()) | 1685 EXPECT_TRUE(Wait()) |
| 1686 << "Timed out while waiting for the encoder to be initialized."; | 1686 << "Timed out while waiting for the encoder to be initialized."; |
| 1687 } | 1687 } |
| 1688 } test; | 1688 } test; |
| 1689 | 1689 |
| 1690 RunBaseTest(&test); | 1690 RunBaseTest(&test); |
| 1691 } | 1691 } |
| 1692 | 1692 |
| 1693 // Disabled on LinuxAsan: | 1693 TEST_F(VideoSendStreamTest, ReconfigureBitratesSetsEncoderBitratesCorrectly) { |
| 1694 // https://bugs.chromium.org/p/webrtc/issues/detail?id=5382 | |
| 1695 #if defined(ADDRESS_SANITIZER) && defined(WEBRTC_LINUX) | |
| 1696 #define MAYBE_ReconfigureBitratesSetsEncoderBitratesCorrectly \ | |
| 1697 DISABLED_ReconfigureBitratesSetsEncoderBitratesCorrectly | |
| 1698 #else | |
| 1699 #define MAYBE_ReconfigureBitratesSetsEncoderBitratesCorrectly \ | |
| 1700 ReconfigureBitratesSetsEncoderBitratesCorrectly | |
| 1701 #endif | |
| 1702 | |
| 1703 TEST_F(VideoSendStreamTest, | |
| 1704 MAYBE_ReconfigureBitratesSetsEncoderBitratesCorrectly) { | |
| 1705 // These are chosen to be "kind of odd" to not be accidentally checked against | 1694 // These are chosen to be "kind of odd" to not be accidentally checked against |
| 1706 // default values. | 1695 // default values. |
| 1707 static const int kMinBitrateKbps = 137; | 1696 static const int kMinBitrateKbps = 137; |
| 1708 static const int kStartBitrateKbps = 345; | 1697 static const int kStartBitrateKbps = 345; |
| 1709 static const int kLowerMaxBitrateKbps = 312; | 1698 static const int kLowerMaxBitrateKbps = 312; |
| 1710 static const int kMaxBitrateKbps = 413; | 1699 static const int kMaxBitrateKbps = 413; |
| 1711 static const int kIncreasedStartBitrateKbps = 451; | 1700 static const int kIncreasedStartBitrateKbps = 451; |
| 1712 static const int kIncreasedMaxBitrateKbps = 597; | 1701 static const int kIncreasedMaxBitrateKbps = 597; |
| 1713 class EncoderBitrateThresholdObserver : public test::SendTest, | 1702 class EncoderBitrateThresholdObserver : public test::SendTest, |
| 1714 public test::FakeEncoder { | 1703 public test::FakeEncoder { |
| (...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2303 observation_complete_.Set(); | 2292 observation_complete_.Set(); |
| 2304 } | 2293 } |
| 2305 } | 2294 } |
| 2306 } test; | 2295 } test; |
| 2307 | 2296 |
| 2308 RunBaseTest(&test); | 2297 RunBaseTest(&test); |
| 2309 } | 2298 } |
| 2310 #endif | 2299 #endif |
| 2311 | 2300 |
| 2312 } // namespace webrtc | 2301 } // namespace webrtc |
| OLD | NEW |