diff options
| author | kmackay <kmackay@chromium.org> | 2016-03-11 13:40:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-11 21:42:35 +0000 |
| commit | 2e5743ab011e6c0776be8d175a9941642b51a6a4 (patch) | |
| tree | 27e22225d250fa6542c2e60b121074f7fb67e5d4 /chromecast | |
| parent | ad1b44e489281f42a0ea6d7d9516ba30d5879225 (diff) | |
| download | chromium_src-2e5743ab011e6c0776be8d175a9941642b51a6a4.zip chromium_src-2e5743ab011e6c0776be8d175a9941642b51a6a4.tar.gz chromium_src-2e5743ab011e6c0776be8d175a9941642b51a6a4.tar.bz2 | |
[Chromecast] Make sure that pause tests use 'sync PTS' mode
BUG= internal b/27613212
Review URL: https://codereview.chromium.org/1786213002
Cr-Commit-Position: refs/heads/master@{#380741}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc b/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc index 7fd2d1d..8cc5c03 100644 --- a/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc +++ b/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc @@ -608,6 +608,7 @@ void AudioVideoPipelineDeviceTest::Initialize() { void AudioVideoPipelineDeviceTest::AddPause(base::TimeDelta delay, base::TimeDelta length) { + DCHECK_EQ(MediaPipelineDeviceParams::kModeSyncPts, sync_type_); pause_pattern_.push_back(PauseInfo(delay, length)); } @@ -645,6 +646,7 @@ void AudioVideoPipelineDeviceTest::AddEffectsStreams() { void AudioVideoPipelineDeviceTest::SetPausePattern( const std::vector<PauseInfo> pattern) { + DCHECK_EQ(MediaPipelineDeviceParams::kModeSyncPts, sync_type_); pause_pattern_ = pattern; } @@ -951,7 +953,7 @@ TEST_F(AudioVideoPipelineDeviceTest, H264Playback) { TEST_F(AudioVideoPipelineDeviceTest, WebmPlaybackWithPause) { scoped_ptr<base::MessageLoop> message_loop(new base::MessageLoop()); - set_sync_type(MediaPipelineDeviceParams::kModeIgnorePts); + set_sync_type(MediaPipelineDeviceParams::kModeSyncPts); // Setup to pause for 100ms every 500ms AddPause(base::TimeDelta::FromMilliseconds(500), base::TimeDelta::FromMilliseconds(100)); @@ -1133,7 +1135,7 @@ TEST_F(AudioVideoPipelineDeviceTest, H264Playback_WithEffectsStreams) { TEST_F(AudioVideoPipelineDeviceTest, WebmPlaybackWithPause_WithEffectsStreams) { scoped_ptr<base::MessageLoop> message_loop(new base::MessageLoop()); - set_sync_type(MediaPipelineDeviceParams::kModeIgnorePts); + set_sync_type(MediaPipelineDeviceParams::kModeSyncPts); // Setup to pause for 100ms every 500ms AddPause(base::TimeDelta::FromMilliseconds(500), base::TimeDelta::FromMilliseconds(100)); |