diff options
| -rw-r--r-- | media/base/pipeline.cc | 4 | ||||
| -rw-r--r-- | media/blink/webmediaplayer_impl.cc | 2 | ||||
| -rw-r--r-- | media/filters/audio_renderer_impl.cc | 7 | ||||
| -rw-r--r-- | media/filters/pipeline_integration_test.cc | 10 | ||||
| -rw-r--r-- | media/filters/pipeline_integration_test_base.cc | 9 | ||||
| -rw-r--r-- | media/filters/pipeline_integration_test_base.h | 2 |
6 files changed, 16 insertions, 18 deletions
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc index 79a50fd..68ae42f 100644 --- a/media/base/pipeline.cc +++ b/media/base/pipeline.cc @@ -357,14 +357,14 @@ void Pipeline::StateTransitionTask(PipelineStatus status) { start_timestamp_ = demuxer_->GetStartTime(); } - base::ResetAndReturn(&seek_cb_).Run(PIPELINE_OK); - DCHECK(start_timestamp_ >= base::TimeDelta()); renderer_->StartPlayingFrom(start_timestamp_); if (text_renderer_) text_renderer_->StartPlaying(); + base::ResetAndReturn(&seek_cb_).Run(PIPELINE_OK); + PlaybackRateChangedTask(GetPlaybackRate()); VolumeChangedTask(GetVolume()); return; diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc index e5f73f0..74db5fe 100644 --- a/media/blink/webmediaplayer_impl.cc +++ b/media/blink/webmediaplayer_impl.cc @@ -325,7 +325,7 @@ bool WebMediaPlayerImpl::supportsSave() const { } void WebMediaPlayerImpl::seek(double seconds) { - DVLOG(1) << __FUNCTION__ << "(" << seconds << ")"; + DVLOG(1) << __FUNCTION__ << "(" << seconds << "s)"; DCHECK(main_task_runner_->BelongsToCurrentThread()); ended_ = false; diff --git a/media/filters/audio_renderer_impl.cc b/media/filters/audio_renderer_impl.cc index 8708a91..0430370 100644 --- a/media/filters/audio_renderer_impl.cc +++ b/media/filters/audio_renderer_impl.cc @@ -138,7 +138,7 @@ void AudioRendererImpl::StopRendering_Locked() { } void AudioRendererImpl::SetMediaTime(base::TimeDelta time) { - DVLOG(1) << __FUNCTION__ << "(" << time.InMicroseconds() << ")"; + DVLOG(1) << __FUNCTION__ << "(" << time << ")"; DCHECK(task_runner_->BelongsToCurrentThread()); base::AutoLock auto_lock(lock_); @@ -162,13 +162,12 @@ base::TimeDelta AudioRendererImpl::CurrentMediaTime() { current_media_time = audio_clock_->front_timestamp(); } - DVLOG(3) << __FUNCTION__ << ": " << current_media_time.InMilliseconds() - << " ms"; + DVLOG(2) << __FUNCTION__ << ": " << current_media_time; return current_media_time; } base::TimeDelta AudioRendererImpl::CurrentMediaTimeForSyncingVideo() { - DVLOG(2) << __FUNCTION__; + DVLOG(3) << __FUNCTION__; base::AutoLock auto_lock(lock_); if (last_render_ticks_.is_null()) diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc index a568221..e3047cf 100644 --- a/media/filters/pipeline_integration_test.cc +++ b/media/filters/pipeline_integration_test.cc @@ -1397,8 +1397,7 @@ TEST_F(PipelineIntegrationTest, EncryptedPlayback_MP4_CENC_KeyRotation_Audio) { } #endif -// TODO(acolwell): Fix flakiness http://crbug.com/117921 -TEST_F(PipelineIntegrationTest, DISABLED_SeekWhilePaused) { +TEST_F(PipelineIntegrationTest, SeekWhilePaused) { ASSERT_TRUE(Start(GetTestDataFilePath("bear-320x240.webm"), PIPELINE_OK)); base::TimeDelta duration(pipeline_->GetMediaDuration()); @@ -1409,20 +1408,19 @@ TEST_F(PipelineIntegrationTest, DISABLED_SeekWhilePaused) { ASSERT_TRUE(WaitUntilCurrentTimeIsAfter(start_seek_time)); Pause(); ASSERT_TRUE(Seek(seek_time)); - EXPECT_EQ(pipeline_->GetMediaTime(), seek_time); + EXPECT_EQ(seek_time, pipeline_->GetMediaTime()); Play(); ASSERT_TRUE(WaitUntilOnEnded()); // Make sure seeking after reaching the end works as expected. Pause(); ASSERT_TRUE(Seek(seek_time)); - EXPECT_EQ(pipeline_->GetMediaTime(), seek_time); + EXPECT_EQ(seek_time, pipeline_->GetMediaTime()); Play(); ASSERT_TRUE(WaitUntilOnEnded()); } -// TODO(acolwell): Fix flakiness http://crbug.com/117921 -TEST_F(PipelineIntegrationTest, DISABLED_SeekWhilePlaying) { +TEST_F(PipelineIntegrationTest, SeekWhilePlaying) { ASSERT_TRUE(Start(GetTestDataFilePath("bear-320x240.webm"), PIPELINE_OK)); base::TimeDelta duration(pipeline_->GetMediaDuration()); diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc index ca8176f..a1a583b 100644 --- a/media/filters/pipeline_integration_test_base.cc +++ b/media/filters/pipeline_integration_test_base.cc @@ -48,7 +48,9 @@ PipelineIntegrationTestBase::~PipelineIntegrationTestBase() { Stop(); } -void PipelineIntegrationTestBase::SaveStatus(PipelineStatus status) { +void PipelineIntegrationTestBase::OnSeeked(base::TimeDelta seek_time, + PipelineStatus status) { + EXPECT_EQ(seek_time, pipeline_->GetMediaTime()); pipeline_status_ = status; } @@ -190,9 +192,8 @@ bool PipelineIntegrationTestBase::Seek(base::TimeDelta seek_time) { EXPECT_CALL(*this, OnBufferingStateChanged(BUFFERING_HAVE_ENOUGH)) .WillOnce(InvokeWithoutArgs(&message_loop_, &base::MessageLoop::QuitNow)); - pipeline_->Seek(seek_time, - base::Bind(&PipelineIntegrationTestBase::SaveStatus, - base::Unretained(this))); + pipeline_->Seek(seek_time, base::Bind(&PipelineIntegrationTestBase::OnSeeked, + base::Unretained(this), seek_time)); message_loop_.Run(); return (pipeline_status_ == PIPELINE_OK); } diff --git a/media/filters/pipeline_integration_test_base.h b/media/filters/pipeline_integration_test_base.h index d05a9ed..c475bec 100644 --- a/media/filters/pipeline_integration_test_base.h +++ b/media/filters/pipeline_integration_test_base.h @@ -113,7 +113,7 @@ class PipelineIntegrationTestBase { AudioHardwareConfig hardware_config_; PipelineMetadata metadata_; - void SaveStatus(PipelineStatus status); + void OnSeeked(base::TimeDelta seek_time, PipelineStatus status); void OnStatusCallbackChecked(PipelineStatus expected_status, PipelineStatus status); void OnStatusCallback(PipelineStatus status); |