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

Unified Diff: media/filters/video_renderer_base.cc

Issue 8897022: Revert 113895 - <video> decode in hardware! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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/gpu_video_decoder.cc ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/video_renderer_base.cc
===================================================================
--- media/filters/video_renderer_base.cc (revision 113907)
+++ media/filters/video_renderer_base.cc (working copy)
@@ -97,15 +97,17 @@
}
void VideoRendererBase::Seek(base::TimeDelta time, const FilterStatusCB& cb) {
- base::AutoLock auto_lock(lock_);
- DCHECK_EQ(state_, kFlushed) << "Must flush prior to seeking.";
- DCHECK(!cb.is_null());
- DCHECK(seek_cb_.is_null());
+ {
+ base::AutoLock auto_lock(lock_);
+ DCHECK_EQ(state_, kFlushed) << "Must flush prior to seeking.";
+ DCHECK(!cb.is_null());
+ DCHECK(seek_cb_.is_null());
- state_ = kSeeking;
- seek_cb_ = cb;
- seek_timestamp_ = time;
- AttemptRead_Locked();
+ state_ = kSeeking;
+ seek_cb_ = cb;
+ seek_timestamp_ = time;
+ AttemptRead_Locked();
+ }
}
void VideoRendererBase::Initialize(VideoDecoder* decoder,
@@ -274,6 +276,7 @@
frames_queue_ready_.pop_front();
AttemptRead_Locked();
}
+
// Continue waiting for the current paint to finish.
continue;
}
@@ -476,6 +479,7 @@
lock_.AssertAcquired();
current_frame_ = NULL;
last_available_frame_ = NULL;
+ DCHECK(!pending_read_);
}
} // namespace media
« no previous file with comments | « media/filters/gpu_video_decoder.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698