| 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 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 } | 510 } |
| 511 | 511 |
| 512 // Without retransmissions FEC for H264 is fine. | 512 // Without retransmissions FEC for H264 is fine. |
| 513 TEST_F(VideoSendStreamTest, DoesUtilizeUlpfecForH264WithoutNackEnabled) { | 513 TEST_F(VideoSendStreamTest, DoesUtilizeUlpfecForH264WithoutNackEnabled) { |
| 514 std::unique_ptr<VideoEncoder> encoder( | 514 std::unique_ptr<VideoEncoder> encoder( |
| 515 new test::FakeH264Encoder(Clock::GetRealTimeClock())); | 515 new test::FakeH264Encoder(Clock::GetRealTimeClock())); |
| 516 UlpfecObserver test(false, false, true, true, "H264", encoder.get()); | 516 UlpfecObserver test(false, false, true, true, "H264", encoder.get()); |
| 517 RunBaseTest(&test); | 517 RunBaseTest(&test); |
| 518 } | 518 } |
| 519 | 519 |
| 520 TEST_F(VideoSendStreamTest, DoesUtilizeUlpfecForVp8WithNackEnabled) { | 520 // Disabled as flaky, see https://crbug.com/webrtc/7285 for details. |
| 521 TEST_F(VideoSendStreamTest, DISABLED_DoesUtilizeUlpfecForVp8WithNackEnabled) { |
| 521 std::unique_ptr<VideoEncoder> encoder(VP8Encoder::Create()); | 522 std::unique_ptr<VideoEncoder> encoder(VP8Encoder::Create()); |
| 522 UlpfecObserver test(false, true, true, true, "VP8", encoder.get()); | 523 UlpfecObserver test(false, true, true, true, "VP8", encoder.get()); |
| 523 RunBaseTest(&test); | 524 RunBaseTest(&test); |
| 524 } | 525 } |
| 525 | 526 |
| 526 #if !defined(RTC_DISABLE_VP9) | 527 #if !defined(RTC_DISABLE_VP9) |
| 527 TEST_F(VideoSendStreamTest, DoesUtilizeUlpfecForVp9WithNackEnabled) { | 528 // Disabled as flaky, see https://crbug.com/webrtc/7285 for details. |
| 529 TEST_F(VideoSendStreamTest, DISABLED_DoesUtilizeUlpfecForVp9WithNackEnabled) { |
| 528 std::unique_ptr<VideoEncoder> encoder(VP9Encoder::Create()); | 530 std::unique_ptr<VideoEncoder> encoder(VP9Encoder::Create()); |
| 529 UlpfecObserver test(false, true, true, true, "VP9", encoder.get()); | 531 UlpfecObserver test(false, true, true, true, "VP9", encoder.get()); |
| 530 RunBaseTest(&test); | 532 RunBaseTest(&test); |
| 531 } | 533 } |
| 532 #endif // !defined(RTC_DISABLE_VP9) | 534 #endif // !defined(RTC_DISABLE_VP9) |
| 533 | 535 |
| 534 TEST_F(VideoSendStreamTest, SupportsUlpfecWithMultithreadedH264) { | 536 TEST_F(VideoSendStreamTest, SupportsUlpfecWithMultithreadedH264) { |
| 535 std::unique_ptr<VideoEncoder> encoder( | 537 std::unique_ptr<VideoEncoder> encoder( |
| 536 new test::MultithreadedFakeH264Encoder(Clock::GetRealTimeClock())); | 538 new test::MultithreadedFakeH264Encoder(Clock::GetRealTimeClock())); |
| 537 UlpfecObserver test(false, false, true, true, "H264", encoder.get()); | 539 UlpfecObserver test(false, false, true, true, "H264", encoder.get()); |
| (...skipping 2744 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3282 rtc::CriticalSection crit_; | 3284 rtc::CriticalSection crit_; |
| 3283 uint32_t max_bitrate_bps_ GUARDED_BY(&crit_); | 3285 uint32_t max_bitrate_bps_ GUARDED_BY(&crit_); |
| 3284 bool first_packet_sent_ GUARDED_BY(&crit_); | 3286 bool first_packet_sent_ GUARDED_BY(&crit_); |
| 3285 rtc::Event bitrate_changed_event_; | 3287 rtc::Event bitrate_changed_event_; |
| 3286 } test; | 3288 } test; |
| 3287 | 3289 |
| 3288 RunBaseTest(&test); | 3290 RunBaseTest(&test); |
| 3289 } | 3291 } |
| 3290 | 3292 |
| 3291 } // namespace webrtc | 3293 } // namespace webrtc |
| OLD | NEW |