| Index: media/base/pipeline_impl.cc
|
| diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
|
| index 0590d00cc550f21be7bc6842bbac941a4d516cde..7eb522b67b73106d8f09fb1da642307d4fa1fcfd 100644
|
| --- a/media/base/pipeline_impl.cc
|
| +++ b/media/base/pipeline_impl.cc
|
| @@ -363,9 +363,6 @@ void PipelineImpl::RendererWrapper::Suspend() {
|
| DCHECK(shared_state_.suspend_timestamp != kNoTimestamp);
|
| }
|
|
|
| - // Abort any reads the renderer may be blocked on.
|
| - demuxer_->AbortPendingReads();
|
| -
|
| // Queue the asynchronous actions required to stop playback.
|
| SerialRunner::Queue fns;
|
|
|
| @@ -802,6 +799,9 @@ void PipelineImpl::RendererWrapper::CompleteSuspend(PipelineStatus status) {
|
| shared_state_.statistics.video_memory_usage = 0;
|
| }
|
|
|
| + // Abort any reads the renderer may have kicked off.
|
| + demuxer_->AbortPendingReads();
|
| +
|
| SetState(kSuspended);
|
| main_task_runner_->PostTask(
|
| FROM_HERE, base::Bind(&PipelineImpl::OnSuspendDone, weak_pipeline_));
|
|
|