| 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 3150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3161 TEST_F(VideoSendStreamTest, | 3161 TEST_F(VideoSendStreamTest, |
| 3162 RequestSourceRotateIfVideoOrientationExtensionNotSupported) { | 3162 RequestSourceRotateIfVideoOrientationExtensionNotSupported) { |
| 3163 TestRequestSourceRotateVideo(false); | 3163 TestRequestSourceRotateVideo(false); |
| 3164 } | 3164 } |
| 3165 | 3165 |
| 3166 TEST_F(VideoSendStreamTest, | 3166 TEST_F(VideoSendStreamTest, |
| 3167 DoNotRequestsRotationIfVideoOrientationExtensionSupported) { | 3167 DoNotRequestsRotationIfVideoOrientationExtensionSupported) { |
| 3168 TestRequestSourceRotateVideo(true); | 3168 TestRequestSourceRotateVideo(true); |
| 3169 } | 3169 } |
| 3170 | 3170 |
| 3171 // Flaky on Win32 Release: http://crbug.com/webrtc/6886 |
| 3172 #if defined(WEBRTC_WIN) |
| 3173 #define MAYBE_RemoveOverheadFromBandwidth DISABLED_RemoveOverheadFromBandwidth |
| 3174 #else |
| 3175 #define MAYBE_RemoveOverheadFromBandwidth RemoveOverheadFromBandwidth |
| 3176 #endif |
| 3171 // This test verifies that overhead is removed from the bandwidth estimate by | 3177 // This test verifies that overhead is removed from the bandwidth estimate by |
| 3172 // testing that the maximum possible target payload rate is smaller than the | 3178 // testing that the maximum possible target payload rate is smaller than the |
| 3173 // maximum bandwidth estimate by the overhead rate. | 3179 // maximum bandwidth estimate by the overhead rate. |
| 3174 TEST_F(VideoSendStreamTest, RemoveOverheadFromBandwidth) { | 3180 TEST_F(VideoSendStreamTest, MAYBE_RemoveOverheadFromBandwidth) { |
| 3175 test::ScopedFieldTrials override_field_trials( | 3181 test::ScopedFieldTrials override_field_trials( |
| 3176 "WebRTC-SendSideBwe-WithOverhead/Enabled/"); | 3182 "WebRTC-SendSideBwe-WithOverhead/Enabled/"); |
| 3177 class RemoveOverheadFromBandwidthTest : public test::EndToEndTest, | 3183 class RemoveOverheadFromBandwidthTest : public test::EndToEndTest, |
| 3178 public test::FakeEncoder { | 3184 public test::FakeEncoder { |
| 3179 public: | 3185 public: |
| 3180 RemoveOverheadFromBandwidthTest() | 3186 RemoveOverheadFromBandwidthTest() |
| 3181 : EndToEndTest(test::CallTest::kDefaultTimeoutMs), | 3187 : EndToEndTest(test::CallTest::kDefaultTimeoutMs), |
| 3182 FakeEncoder(Clock::GetRealTimeClock()), | 3188 FakeEncoder(Clock::GetRealTimeClock()), |
| 3183 call_(nullptr), | 3189 call_(nullptr), |
| 3184 max_bitrate_kbps_(0) {} | 3190 max_bitrate_kbps_(0) {} |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3226 private: | 3232 private: |
| 3227 Call* call_; | 3233 Call* call_; |
| 3228 rtc::CriticalSection crit_; | 3234 rtc::CriticalSection crit_; |
| 3229 uint32_t max_bitrate_kbps_ GUARDED_BY(&crit_); | 3235 uint32_t max_bitrate_kbps_ GUARDED_BY(&crit_); |
| 3230 } test; | 3236 } test; |
| 3231 | 3237 |
| 3232 RunBaseTest(&test); | 3238 RunBaseTest(&test); |
| 3233 } | 3239 } |
| 3234 | 3240 |
| 3235 } // namespace webrtc | 3241 } // namespace webrtc |
| OLD | NEW |