| Index: media/filters/video_renderer_base.cc
|
| diff --git a/media/filters/video_renderer_base.cc b/media/filters/video_renderer_base.cc
|
| index 51622298f4ec12eb4b673117ded7ccec4ce3bd96..361f64775b636cfa0c6792946b38c6505df4507c 100644
|
| --- a/media/filters/video_renderer_base.cc
|
| +++ b/media/filters/video_renderer_base.cc
|
| @@ -97,17 +97,15 @@ void VideoRendererBase::SetPlaybackRate(float playback_rate) {
|
| }
|
|
|
| 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());
|
| -
|
| - state_ = kSeeking;
|
| - seek_cb_ = cb;
|
| - seek_timestamp_ = time;
|
| - AttemptRead_Locked();
|
| - }
|
| + 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();
|
| }
|
|
|
| void VideoRendererBase::Initialize(VideoDecoder* decoder,
|
| @@ -276,7 +274,6 @@ void VideoRendererBase::ThreadMain() {
|
| frames_queue_ready_.pop_front();
|
| AttemptRead_Locked();
|
| }
|
| -
|
| // Continue waiting for the current paint to finish.
|
| continue;
|
| }
|
|
|