| Index: media/renderers/video_renderer_impl.cc
|
| diff --git a/media/renderers/video_renderer_impl.cc b/media/renderers/video_renderer_impl.cc
|
| index a43ddab64283cbb22c8e5fa36a0fb34574861967..b60f44dc4c2d0b23fd2aedd185ecd80ed119460a 100644
|
| --- a/media/renderers/video_renderer_impl.cc
|
| +++ b/media/renderers/video_renderer_impl.cc
|
| @@ -190,11 +190,6 @@ void VideoRendererImpl::ThreadMain() {
|
| const base::TimeDelta kIdleTimeDelta =
|
| base::TimeDelta::FromMilliseconds(10);
|
|
|
| - // If we have no frames and haven't painted any frame for certain amount of
|
| - // time, declare BUFFERING_HAVE_NOTHING.
|
| - const base::TimeDelta kTimeToDeclareHaveNothing =
|
| - base::TimeDelta::FromSeconds(3);
|
| -
|
| for (;;) {
|
| base::AutoLock auto_lock(lock_);
|
|
|
| @@ -217,8 +212,7 @@ void VideoRendererImpl::ThreadMain() {
|
| rendered_end_of_stream_ = true;
|
| task_runner_->PostTask(FROM_HERE, ended_cb_);
|
| }
|
| - } else if (!last_painted_time_.is_null() &&
|
| - now - last_painted_time_ >= kTimeToDeclareHaveNothing) {
|
| + } else {
|
| buffering_state_ = BUFFERING_HAVE_NOTHING;
|
| task_runner_->PostTask(
|
| FROM_HERE, base::Bind(buffering_state_cb_, BUFFERING_HAVE_NOTHING));
|
| @@ -285,8 +279,7 @@ void VideoRendererImpl::PaintNextReadyFrame_Locked() {
|
| ready_frames_.pop_front();
|
| frames_decoded_++;
|
|
|
| - last_media_time_ = last_painted_time_ =
|
| - wall_clock_time_cb_.Run(next_frame->timestamp());
|
| + last_media_time_ = wall_clock_time_cb_.Run(next_frame->timestamp());
|
|
|
| paint_cb_.Run(next_frame);
|
|
|
| @@ -443,7 +436,7 @@ void VideoRendererImpl::OnVideoFrameStreamResetDone() {
|
| DCHECK_EQ(buffering_state_, BUFFERING_HAVE_NOTHING);
|
|
|
| state_ = kFlushed;
|
| - last_media_time_ = last_painted_time_ = base::TimeTicks();
|
| + last_media_time_ = base::TimeTicks();
|
| base::ResetAndReturn(&flush_cb_).Run();
|
| }
|
|
|
|
|