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

Unified Diff: media/filters/video_renderer_base.cc

Issue 8184003: Fix hangs & crashes in teardown-during-Seek. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 2 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/ffmpeg_video_decoder.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/video_renderer_base.cc
diff --git a/media/filters/video_renderer_base.cc b/media/filters/video_renderer_base.cc
index ee951613eeb7900fa711629ad47588c13c22cbed..8334cd1392bccc87d005f878cc4df14b0926d461 100644
--- a/media/filters/video_renderer_base.cc
+++ b/media/filters/video_renderer_base.cc
@@ -38,7 +38,7 @@ VideoRendererBase::VideoRendererBase()
VideoRendererBase::~VideoRendererBase() {
base::AutoLock auto_lock(lock_);
- DCHECK(state_ == kUninitialized || state_ == kStopped);
+ DCHECK(state_ == kUninitialized || state_ == kStopped) << state_;
}
void VideoRendererBase::Play(const base::Closure& callback) {
@@ -95,7 +95,7 @@ void VideoRendererBase::SetPlaybackRate(float playback_rate) {
playback_rate_ = playback_rate;
}
-void VideoRendererBase::Seek(base::TimeDelta time, const FilterStatusCB& cb) {
+void VideoRendererBase::Seek(base::TimeDelta time, const FilterStatusCB& cb) {
bool run_callback = false;
{
@@ -112,7 +112,6 @@ void VideoRendererBase::Seek(base::TimeDelta time, const FilterStatusCB& cb) {
if (state_ == kPrerolled) {
// Already get enough buffers from decoder.
run_callback = true;
-
} else {
// Otherwise we are either kFlushed or kSeeking, but without enough
// buffers we should save the callback function and call it later.
« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698