Index: media/renderers/renderer_impl_unittest.cc |
diff --git a/media/renderers/renderer_impl_unittest.cc b/media/renderers/renderer_impl_unittest.cc |
index 77480f96ac2c945bf0ed02cbcc10d511c10eb559..526cc2ede0be6eea54bd15d5292f3b4aaeb048c1 100644 |
--- a/media/renderers/renderer_impl_unittest.cc |
+++ b/media/renderers/renderer_impl_unittest.cc |
@@ -32,6 +32,10 @@ namespace media { |
const int64_t kStartPlayingTimeInMs = 100; |
+ACTION_P2(SetBool, var, value) { |
+ *var = value; |
+} |
+ |
ACTION_P2(SetBufferingState, renderer_client, buffering_state) { |
(*renderer_client)->OnBufferingStateChange(buffering_state); |
} |
@@ -226,10 +230,7 @@ class RendererImplTest : public ::testing::Test { |
base::RunLoop().RunUntilIdle(); |
} |
- void Flush(bool underflowed) { |
- if (!underflowed) |
- EXPECT_CALL(time_source_, StopTicking()); |
- |
+ void SetFlushExpectationsForAVRenderers() { |
if (audio_stream_) { |
EXPECT_CALL(*audio_renderer_, Flush(_)) |
.WillOnce(DoAll(SetBufferingState(&audio_renderer_client_, |
@@ -243,7 +244,13 @@ class RendererImplTest : public ::testing::Test { |
BUFFERING_HAVE_NOTHING), |
RunClosure<0>())); |
} |
+ } |
+ |
+ void Flush(bool underflowed) { |
+ if (!underflowed) |
+ EXPECT_CALL(time_source_, StopTicking()); |
+ SetFlushExpectationsForAVRenderers(); |
EXPECT_CALL(callbacks_, OnFlushed()); |
renderer_impl_->Flush( |
@@ -848,4 +855,94 @@ TEST_F(RendererImplTest, PostponedStreamStatusNotificationHandling) { |
base::RunLoop().Run(); |
} |
+// Verify that a RendererImpl::Flush gets postponed until after stream status |
DaleCurtis
2017/03/31 21:22:08
Opposite tests are needed, Flush is ongoing and Re
servolk
2017/03/31 23:53:55
Done.
|
+// change handling is completed. |
+TEST_F(RendererImplTest, FlushDuringAudioReinit) { |
+ CreateAudioAndVideoStream(); |
+ |
+ StreamStatusChangeCB stream_status_change_cb; |
+ EXPECT_CALL(*demuxer_, SetStreamStatusChangeCB(_)) |
+ .WillOnce(SaveArg<0>(&stream_status_change_cb)); |
+ SetAudioRendererInitializeExpectations(PIPELINE_OK); |
+ SetVideoRendererInitializeExpectations(PIPELINE_OK); |
+ InitializeAndExpect(PIPELINE_OK); |
+ Play(); |
+ |
+ EXPECT_CALL(time_source_, StopTicking()).Times(testing::AnyNumber()); |
+ base::Closure audio_renderer_flush_cb; |
+ EXPECT_CALL(*audio_renderer_, Flush(_)) |
+ .WillOnce(SaveArg<0>(&audio_renderer_flush_cb)); |
+ EXPECT_CALL(*audio_renderer_, StartPlaying()) |
+ .Times(1) |
+ .WillOnce( |
+ SetBufferingState(&audio_renderer_client_, BUFFERING_HAVE_ENOUGH)); |
+ |
+ // This should start flushing the audio renderer (due to audio stream status |
+ // change) and should populate the |audio_renderer_flush_cb|. |
+ stream_status_change_cb.Run(audio_stream_.get(), false, base::TimeDelta()); |
+ EXPECT_TRUE(audio_renderer_flush_cb); |
+ base::RunLoop().RunUntilIdle(); |
+ |
+ bool flush_done = false; |
+ |
+ // Now that audio stream change is being handled the RendererImpl::Flush |
+ // should be postponed, instead of being executed immediately. |
+ EXPECT_CALL(callbacks_, OnFlushed()).WillOnce(SetBool(&flush_done, true)); |
+ renderer_impl_->Flush( |
+ base::Bind(&CallbackHelper::OnFlushed, base::Unretained(&callbacks_))); |
+ base::RunLoop().RunUntilIdle(); |
+ EXPECT_FALSE(flush_done); |
+ |
+ // The renderer_impl_->Flush invoked above should proceed after the first |
+ // audio renderer flush (initiated by the stream status change) completes. |
+ SetFlushExpectationsForAVRenderers(); |
+ audio_renderer_flush_cb.Run(); |
+ base::RunLoop().RunUntilIdle(); |
+ EXPECT_TRUE(flush_done); |
+} |
+ |
+TEST_F(RendererImplTest, FlushDuringVideoReinit) { |
+ CreateAudioAndVideoStream(); |
+ |
+ StreamStatusChangeCB stream_status_change_cb; |
+ EXPECT_CALL(*demuxer_, SetStreamStatusChangeCB(_)) |
+ .WillOnce(SaveArg<0>(&stream_status_change_cb)); |
+ SetAudioRendererInitializeExpectations(PIPELINE_OK); |
+ SetVideoRendererInitializeExpectations(PIPELINE_OK); |
+ InitializeAndExpect(PIPELINE_OK); |
+ Play(); |
+ |
+ EXPECT_CALL(time_source_, StopTicking()).Times(testing::AnyNumber()); |
+ base::Closure video_renderer_flush_cb; |
+ EXPECT_CALL(*video_renderer_, Flush(_)) |
+ .WillOnce(SaveArg<0>(&video_renderer_flush_cb)); |
+ EXPECT_CALL(*video_renderer_, StartPlayingFrom(_)) |
+ .Times(1) |
+ .WillOnce( |
+ SetBufferingState(&video_renderer_client_, BUFFERING_HAVE_ENOUGH)); |
+ |
+ // This should start flushing the video renderer (due to video stream status |
+ // change) and should populate the |video_renderer_flush_cb|. |
+ stream_status_change_cb.Run(video_stream_.get(), false, base::TimeDelta()); |
+ EXPECT_TRUE(video_renderer_flush_cb); |
+ base::RunLoop().RunUntilIdle(); |
+ |
+ bool flush_done = false; |
+ |
+ // Now that video stream change is being handled the RendererImpl::Flush |
+ // should be postponed, instead of being executed immediately. |
+ EXPECT_CALL(callbacks_, OnFlushed()).WillOnce(SetBool(&flush_done, true)); |
+ renderer_impl_->Flush( |
+ base::Bind(&CallbackHelper::OnFlushed, base::Unretained(&callbacks_))); |
+ base::RunLoop().RunUntilIdle(); |
+ EXPECT_FALSE(flush_done); |
+ |
+ // The renderer_impl_->Flush invoked above should proceed after the first |
+ // video renderer flush (initiated by the stream status change) completes. |
+ SetFlushExpectationsForAVRenderers(); |
+ video_renderer_flush_cb.Run(); |
+ base::RunLoop().RunUntilIdle(); |
+ EXPECT_TRUE(flush_done); |
+} |
+ |
} // namespace media |