| Index: media/filters/gpu_video_decoder.cc
|
| diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc
|
| index 44ccf35ec1e4c81af67d2c7ffaac89196df5ed05..8565fc7687eb94919fdd7cf9e7c8c9f39a35a35a 100644
|
| --- a/media/filters/gpu_video_decoder.cc
|
| +++ b/media/filters/gpu_video_decoder.cc
|
| @@ -19,6 +19,7 @@
|
| #include "media/base/pipeline_status.h"
|
| #include "media/base/video_decoder_config.h"
|
| #include "media/filters/gpu_video_accelerator_factories.h"
|
| +#include "third_party/skia/include/core/SkBitmap.h"
|
|
|
| namespace media {
|
|
|
| @@ -72,7 +73,7 @@ void GpuVideoDecoder::Reset(const base::Closure& closure) {
|
| DVLOG(3) << "Reset()";
|
| DCHECK(gvd_loop_proxy_->BelongsToCurrentThread());
|
|
|
| - if (state_ == kDrainingDecoder && !factories_->IsAborted()) {
|
| + if (state_ == kDrainingDecoder) {
|
| gvd_loop_proxy_->PostTask(FROM_HERE, base::Bind(
|
| &GpuVideoDecoder::Reset, weak_this_, closure));
|
| // NOTE: if we're deferring Reset() until a Flush() completes, return
|
| @@ -440,10 +441,12 @@ void GpuVideoDecoder::PictureReady(const media::Picture& picture) {
|
| visible_rect,
|
| natural_size,
|
| timestamp,
|
| - base::Bind(&GpuVideoAcceleratorFactories::ReadPixels,
|
| - factories_,
|
| - pb.texture_id(),
|
| - gfx::Size(visible_rect.width(), visible_rect.height())),
|
| + media::BindToLoopSync(
|
| + factories_->GetMessageLoop(),
|
| + base::Bind(&GpuVideoAcceleratorFactories::ReadPixels,
|
| + factories_,
|
| + pb.texture_id(),
|
| + gfx::Size(visible_rect.width(), visible_rect.height()))),
|
| base::Closure()));
|
| CHECK_GT(available_pictures_, 0);
|
| --available_pictures_;
|
|
|