OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2017 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 | 10 |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 AudioBweTest::PerformTest(); | 132 AudioBweTest::PerformTest(); |
133 } | 133 } |
134 | 134 |
135 private: | 135 private: |
136 Call* sender_call_; | 136 Call* sender_call_; |
137 rtc::TaskQueue stats_poller_; | 137 rtc::TaskQueue stats_poller_; |
138 }; | 138 }; |
139 | 139 |
140 using AudioBweIntegrationTest = CallTest; | 140 using AudioBweIntegrationTest = CallTest; |
141 | 141 |
142 // TODO(tschumim): This test is flaky when run on android. Re-enable the test | 142 // TODO(tschumim): This test is flaky when run on android and mac. Re-enable the |
143 // for android when the issue is fixed. | 143 // test for when the issue is fixed. |
144 #if defined(WEBRTC_ANDROID) | 144 TEST_F(AudioBweIntegrationTest, DISABLED_NoBandwidthDropAfterDtx) { |
145 #define MAYBE_NoBandwidthDropAfterDtx DISABLED_NoBandwidthDropAfterDtx | |
146 #else | |
147 #define MAYBE_NoBandwidthDropAfterDtx NoBandwidthDropAfterDtx | |
148 #endif | |
149 TEST_F(AudioBweIntegrationTest, MAYBE_NoBandwidthDropAfterDtx) { | |
150 webrtc::test::ScopedFieldTrials override_field_trials( | 145 webrtc::test::ScopedFieldTrials override_field_trials( |
151 "WebRTC-Audio-SendSideBwe/Enabled/" | 146 "WebRTC-Audio-SendSideBwe/Enabled/" |
152 "WebRTC-SendSideBwe-WithOverhead/Enabled/"); | 147 "WebRTC-SendSideBwe-WithOverhead/Enabled/"); |
153 NoBandwidthDropAfterDtx test; | 148 NoBandwidthDropAfterDtx test; |
154 RunBaseTest(&test); | 149 RunBaseTest(&test); |
155 } | 150 } |
156 | 151 |
157 } // namespace test | 152 } // namespace test |
158 } // namespace webrtc | 153 } // namespace webrtc |
OLD | NEW |