Chromium Code Reviews| 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> | 10 #include <algorithm> |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 370 voe_base->Release(); | 370 voe_base->Release(); |
| 371 voe_codec->Release(); | 371 voe_codec->Release(); |
| 372 voe_network->Release(); | 372 voe_network->Release(); |
| 373 voe_sync->Release(); | 373 voe_sync->Release(); |
| 374 | 374 |
| 375 DestroyCalls(); | 375 DestroyCalls(); |
| 376 | 376 |
| 377 VoiceEngine::Delete(voice_engine); | 377 VoiceEngine::Delete(voice_engine); |
| 378 } | 378 } |
| 379 | 379 |
| 380 TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithAudioCreatedFirst) { | 380 // TODO(danilchap): Enable this test for detailed AVSync troubleshooting. |
| 381 TEST_F(CallPerfTest, | |
| 382 DISABLED_PlaysOutAudioAndVideoInSyncWithAudioCreatedFirst) { | |
| 381 TestAudioVideoSync(false, true, DriftingClock::kNoDrift, | 383 TestAudioVideoSync(false, true, DriftingClock::kNoDrift, |
| 382 DriftingClock::kNoDrift, DriftingClock::kNoDrift); | 384 DriftingClock::kNoDrift, DriftingClock::kNoDrift); |
| 383 } | 385 } |
| 384 | 386 |
| 385 TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithVideoCreatedFirst) { | 387 // TODO(danilchap): Enable this test for detailed AVSync troubleshooting. |
| 388 TEST_F(CallPerfTest, | |
| 389 DISABLED_PlaysOutAudioAndVideoInSyncWithVideoCreatedFirst) { | |
| 386 TestAudioVideoSync(false, false, DriftingClock::kNoDrift, | 390 TestAudioVideoSync(false, false, DriftingClock::kNoDrift, |
| 387 DriftingClock::kNoDrift, DriftingClock::kNoDrift); | 391 DriftingClock::kNoDrift, DriftingClock::kNoDrift); |
| 388 } | 392 } |
| 389 | 393 |
| 390 TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithFec) { | 394 // TODO(danilchap): Enable this test for detailed AVSync troubleshooting. |
| 395 TEST_F(CallPerfTest, DISABLED_PlaysOutAudioAndVideoInSyncWithFec) { | |
| 391 TestAudioVideoSync(true, false, DriftingClock::kNoDrift, | 396 TestAudioVideoSync(true, false, DriftingClock::kNoDrift, |
| 392 DriftingClock::kNoDrift, DriftingClock::kNoDrift); | 397 DriftingClock::kNoDrift, DriftingClock::kNoDrift); |
| 393 } | 398 } |
| 394 | 399 |
| 395 // TODO(danilchap): Reenable after adding support for frame capture clock | 400 // TODO(danilchap): Reenable after adding support for frame capture clock |
| 396 // that is not in sync with local TickTime clock. | 401 // that is not in sync with local TickTime clock. |
| 397 TEST_F(CallPerfTest, DISABLED_PlaysOutAudioAndVideoInSyncWithVideoNtpDrift) { | 402 TEST_F(CallPerfTest, DISABLED_PlaysOutAudioAndVideoInSyncWithVideoNtpDrift) { |
| 398 TestAudioVideoSync(false, true, DriftingClock::PercentsFaster(10.0f), | 403 TestAudioVideoSync(false, true, DriftingClock::PercentsFaster(10.0f), |
| 399 DriftingClock::kNoDrift, DriftingClock::kNoDrift); | 404 DriftingClock::kNoDrift, DriftingClock::kNoDrift); |
| 400 } | 405 } |
| 401 | 406 |
| 402 TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithAudioRtpDrift) { | 407 // TODO(danilchap): Enable this test for detailed AVSync troubleshooting. |
| 408 TEST_F(CallPerfTest, DISABLED_PlaysOutAudioAndVideoInSyncWithAudioRtpDrift) { | |
| 403 TestAudioVideoSync(false, true, DriftingClock::kNoDrift, | 409 TestAudioVideoSync(false, true, DriftingClock::kNoDrift, |
| 404 DriftingClock::kNoDrift, | 410 DriftingClock::kNoDrift, |
| 405 DriftingClock::PercentsFaster(30.0f)); | 411 DriftingClock::PercentsFaster(30.0f)); |
| 406 } | 412 } |
| 407 | 413 |
| 408 TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithVideoRtpDrift) { | 414 // TODO(danilchap): Enable this test for detailed AVSync troubleshooting. |
| 415 TEST_F(CallPerfTest, DISABLED_PlaysOutAudioAndVideoInSyncWithVideoRtpDrift) { | |
| 409 TestAudioVideoSync(false, true, DriftingClock::kNoDrift, | 416 TestAudioVideoSync(false, true, DriftingClock::kNoDrift, |
| 410 DriftingClock::PercentsFaster(30.0f), | 417 DriftingClock::PercentsFaster(30.0f), |
| 411 DriftingClock::kNoDrift); | 418 DriftingClock::kNoDrift); |
| 412 } | 419 } |
| 413 | 420 |
| 414 TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithAudioFasterThanVideoDrift) { | 421 TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithAudioFasterThanVideoDrift) { |
| 415 TestAudioVideoSync(false, true, DriftingClock::kNoDrift, | 422 TestAudioVideoSync(false, true, DriftingClock::kNoDrift, |
| 416 DriftingClock::PercentsSlower(30.0f), | 423 DriftingClock::PercentsSlower(30.0f), |
| 417 DriftingClock::PercentsFaster(30.0f)); | 424 DriftingClock::PercentsFaster(30.0f)); |
| 418 } | 425 } |
| 419 | 426 |
| 420 TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithVideoFasterThanAudioDrift) { | 427 TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithVideoFasterThanAudioDrift) { |
| 421 TestAudioVideoSync(false, true, DriftingClock::kNoDrift, | 428 TestAudioVideoSync(true, false, DriftingClock::kNoDrift, |
|
kwiberg-webrtc
2016/02/12 09:30:38
This change appears to be unrelated to the rest of
danilchap
2016/02/12 09:54:26
flags changed to cover situations that were covere
kwiberg-webrtc
2016/02/12 10:07:09
Oh, OK.
| |
| 422 DriftingClock::PercentsFaster(30.0f), | 429 DriftingClock::PercentsFaster(30.0f), |
| 423 DriftingClock::PercentsSlower(30.0f)); | 430 DriftingClock::PercentsSlower(30.0f)); |
| 424 } | 431 } |
| 425 | 432 |
| 426 void CallPerfTest::TestCaptureNtpTime(const FakeNetworkPipe::Config& net_config, | 433 void CallPerfTest::TestCaptureNtpTime(const FakeNetworkPipe::Config& net_config, |
| 427 int threshold_ms, | 434 int threshold_ms, |
| 428 int start_time_ms, | 435 int start_time_ms, |
| 429 int run_time_ms) { | 436 int run_time_ms) { |
| 430 class CaptureNtpTimeObserver : public test::EndToEndTest, | 437 class CaptureNtpTimeObserver : public test::EndToEndTest, |
| 431 public VideoRenderer { | 438 public VideoRenderer { |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 796 int encoder_inits_; | 803 int encoder_inits_; |
| 797 uint32_t last_set_bitrate_; | 804 uint32_t last_set_bitrate_; |
| 798 VideoSendStream* send_stream_; | 805 VideoSendStream* send_stream_; |
| 799 VideoEncoderConfig encoder_config_; | 806 VideoEncoderConfig encoder_config_; |
| 800 } test; | 807 } test; |
| 801 | 808 |
| 802 RunBaseTest(&test); | 809 RunBaseTest(&test); |
| 803 } | 810 } |
| 804 | 811 |
| 805 } // namespace webrtc | 812 } // namespace webrtc |
| OLD | NEW |