Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(645)

Unified Diff: media/base/pipeline_impl_unittest.cc

Issue 1824923002: Revert of media: Stop flushing the renderer for pipeline suspend (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/pipeline_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline_impl_unittest.cc
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index 49f69bd9de5d440f97b1918dcaaf9cc64f48000d..d08ecf1c173c58526069edb5d0c1cf23059e88ad 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -276,6 +276,11 @@
void ExpectSuspend() {
EXPECT_CALL(*renderer_, SetPlaybackRate(0));
+ EXPECT_CALL(*renderer_, Flush(_))
+ .WillOnce(DoAll(
+ SetBufferingState(&buffering_state_cb_, BUFFERING_HAVE_NOTHING),
+ RunClosure<0>()));
+ EXPECT_CALL(callbacks_, OnBufferingStateChange(BUFFERING_HAVE_NOTHING));
EXPECT_CALL(callbacks_, OnSuspend(PIPELINE_OK));
}
@@ -1076,7 +1081,12 @@
base::Bind(&CallbackHelper::OnStop, base::Unretained(&callbacks_));
EXPECT_CALL(*renderer_, SetPlaybackRate(0));
+ EXPECT_CALL(callbacks_, OnBufferingStateChange(BUFFERING_HAVE_NOTHING));
EXPECT_CALL(callbacks_, OnSuspend(PIPELINE_OK));
+ EXPECT_CALL(*renderer_, Flush(_))
+ .WillOnce(DoAll(
+ SetBufferingState(&buffering_state_cb_, BUFFERING_HAVE_NOTHING),
+ RunClosure<0>()));
if (state == kResuming) {
if (stop_or_error == kStop) {
EXPECT_CALL(*demuxer_, Seek(_, _))
« no previous file with comments | « media/base/pipeline_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698