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

Unified Diff: media/filters/video_renderer_impl.cc

Issue 271923002: Remove VideoRenderer::Pause() as it serves no real purpose. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 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/filters/video_renderer_impl.h ('k') | media/filters/video_renderer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/video_renderer_impl.cc
diff --git a/media/filters/video_renderer_impl.cc b/media/filters/video_renderer_impl.cc
index 56dda7ba2b9949025add68846a53caab68e6229e..736a91f2f28750c6ef12d696a2fe503dd58b628b 100644
--- a/media/filters/video_renderer_impl.cc
+++ b/media/filters/video_renderer_impl.cc
@@ -57,18 +57,10 @@ void VideoRendererImpl::Play(const base::Closure& callback) {
callback.Run();
}
-void VideoRendererImpl::Pause(const base::Closure& callback) {
- DCHECK(task_runner_->BelongsToCurrentThread());
- base::AutoLock auto_lock(lock_);
- DCHECK_NE(state_, kUninitialized);
- state_ = kPaused;
- callback.Run();
-}
-
void VideoRendererImpl::Flush(const base::Closure& callback) {
DCHECK(task_runner_->BelongsToCurrentThread());
base::AutoLock auto_lock(lock_);
- DCHECK_EQ(state_, kPaused);
+ DCHECK_NE(state_, kUninitialized);
flush_cb_ = callback;
state_ = kFlushing;
@@ -128,7 +120,7 @@ void VideoRendererImpl::Preroll(base::TimeDelta time,
base::AutoLock auto_lock(lock_);
DCHECK(!cb.is_null());
DCHECK(preroll_cb_.is_null());
- DCHECK(state_ == kFlushed || state_== kPaused) << "state_ " << state_;
+ DCHECK(state_ == kFlushed || state_ == kPlaying) << "state_ " << state_;
if (state_ == kFlushed) {
DCHECK(time != kNoTimestamp());
@@ -449,7 +441,6 @@ void VideoRendererImpl::AttemptRead_Locked() {
}
switch (state_) {
- case kPaused:
case kPrerolling:
case kPrerolled:
case kPlaying:
« no previous file with comments | « media/filters/video_renderer_impl.h ('k') | media/filters/video_renderer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698