| 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 3151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3162 TEST_F(VideoSendStreamTest, | 3162 TEST_F(VideoSendStreamTest, |
| 3163 RequestSourceRotateIfVideoOrientationExtensionNotSupported) { | 3163 RequestSourceRotateIfVideoOrientationExtensionNotSupported) { |
| 3164 TestRequestSourceRotateVideo(false); | 3164 TestRequestSourceRotateVideo(false); |
| 3165 } | 3165 } |
| 3166 | 3166 |
| 3167 TEST_F(VideoSendStreamTest, | 3167 TEST_F(VideoSendStreamTest, |
| 3168 DoNotRequestsRotationIfVideoOrientationExtensionSupported) { | 3168 DoNotRequestsRotationIfVideoOrientationExtensionSupported) { |
| 3169 TestRequestSourceRotateVideo(true); | 3169 TestRequestSourceRotateVideo(true); |
| 3170 } | 3170 } |
| 3171 | 3171 |
| 3172 // Flaky on Win http://crbug.com/webrtc/6886 |
| 3173 #if defined(WEBRTC_WIN) |
| 3174 #define MAYBE_RemoveOverheadFromBandwidth DISABLED_RemoveOverheadFromBandwidth |
| 3175 #else |
| 3176 #define MAYBE_RemoveOverheadFromBandwidth RemoveOverheadFromBandwidth |
| 3177 #endif |
| 3178 |
| 3172 // This test verifies that overhead is removed from the bandwidth estimate by | 3179 // This test verifies that overhead is removed from the bandwidth estimate by |
| 3173 // testing that the maximum possible target payload rate is smaller than the | 3180 // testing that the maximum possible target payload rate is smaller than the |
| 3174 // maximum bandwidth estimate by the overhead rate. | 3181 // maximum bandwidth estimate by the overhead rate. |
| 3175 TEST_F(VideoSendStreamTest, RemoveOverheadFromBandwidth) { | 3182 TEST_F(VideoSendStreamTest, MAYBE_RemoveOverheadFromBandwidth) { |
| 3176 test::ScopedFieldTrials override_field_trials( | 3183 test::ScopedFieldTrials override_field_trials( |
| 3177 "WebRTC-SendSideBwe-WithOverhead/Enabled/"); | 3184 "WebRTC-SendSideBwe-WithOverhead/Enabled/"); |
| 3178 class RemoveOverheadFromBandwidthTest : public test::EndToEndTest, | 3185 class RemoveOverheadFromBandwidthTest : public test::EndToEndTest, |
| 3179 public test::FakeEncoder { | 3186 public test::FakeEncoder { |
| 3180 public: | 3187 public: |
| 3181 RemoveOverheadFromBandwidthTest() | 3188 RemoveOverheadFromBandwidthTest() |
| 3182 : EndToEndTest(test::CallTest::kDefaultTimeoutMs), | 3189 : EndToEndTest(test::CallTest::kDefaultTimeoutMs), |
| 3183 FakeEncoder(Clock::GetRealTimeClock()), | 3190 FakeEncoder(Clock::GetRealTimeClock()), |
| 3184 call_(nullptr), | 3191 call_(nullptr), |
| 3185 max_bitrate_bps_(0), | 3192 max_bitrate_bps_(0), |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3243 rtc::CriticalSection crit_; | 3250 rtc::CriticalSection crit_; |
| 3244 uint32_t max_bitrate_bps_ GUARDED_BY(&crit_); | 3251 uint32_t max_bitrate_bps_ GUARDED_BY(&crit_); |
| 3245 bool first_packet_sent_ GUARDED_BY(&crit_); | 3252 bool first_packet_sent_ GUARDED_BY(&crit_); |
| 3246 rtc::Event bitrate_changed_event_; | 3253 rtc::Event bitrate_changed_event_; |
| 3247 } test; | 3254 } test; |
| 3248 | 3255 |
| 3249 RunBaseTest(&test); | 3256 RunBaseTest(&test); |
| 3250 } | 3257 } |
| 3251 | 3258 |
| 3252 } // namespace webrtc | 3259 } // namespace webrtc |
| OLD | NEW |