| Index: media/filters/ffmpeg_video_decoder.cc
|
| diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
|
| index 78b9b28f7a5115ee3deb6890d2e09cc31aa401aa..78cdcd9a29babef870bc122bc666dfff70a7a90e 100644
|
| --- a/media/filters/ffmpeg_video_decoder.cc
|
| +++ b/media/filters/ffmpeg_video_decoder.cc
|
| @@ -11,7 +11,7 @@
|
| #include "base/callback_helpers.h"
|
| #include "base/command_line.h"
|
| #include "base/location.h"
|
| -#include "base/message_loop/message_loop_proxy.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "media/base/bind_to_loop.h"
|
| #include "media/base/decoder_buffer.h"
|
| @@ -55,8 +55,8 @@ static int GetThreadCount(AVCodecID codec_id) {
|
| }
|
|
|
| FFmpegVideoDecoder::FFmpegVideoDecoder(
|
| - const scoped_refptr<base::MessageLoopProxy>& message_loop)
|
| - : message_loop_(message_loop),
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& task_runner)
|
| + : task_runner_(task_runner),
|
| weak_factory_(this),
|
| state_(kUninitialized) {
|
| }
|
| @@ -129,7 +129,7 @@ static void ReleaseVideoBufferImpl(AVCodecContext* s, AVFrame* frame) {
|
|
|
| void FFmpegVideoDecoder::Initialize(const VideoDecoderConfig& config,
|
| const PipelineStatusCB& status_cb) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| DCHECK(decode_cb_.is_null());
|
| DCHECK(reset_cb_.is_null());
|
| DCHECK(!config.is_encrypted());
|
| @@ -152,7 +152,7 @@ void FFmpegVideoDecoder::Initialize(const VideoDecoderConfig& config,
|
|
|
| void FFmpegVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
|
| const DecodeCB& decode_cb) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| DCHECK(!decode_cb.is_null());
|
| CHECK_NE(state_, kUninitialized);
|
| CHECK(decode_cb_.is_null()) << "Overlapping decodes are not supported.";
|
| @@ -173,7 +173,7 @@ void FFmpegVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
|
| }
|
|
|
| void FFmpegVideoDecoder::Reset(const base::Closure& closure) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| DCHECK(reset_cb_.is_null());
|
| reset_cb_ = BindToCurrentLoop(closure);
|
|
|
| @@ -193,7 +193,7 @@ void FFmpegVideoDecoder::DoReset() {
|
| }
|
|
|
| void FFmpegVideoDecoder::Stop(const base::Closure& closure) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| base::ScopedClosureRunner runner(BindToCurrentLoop(closure));
|
|
|
| if (state_ == kUninitialized)
|
| @@ -218,7 +218,7 @@ FFmpegVideoDecoder::~FFmpegVideoDecoder() {
|
|
|
| void FFmpegVideoDecoder::DecodeBuffer(
|
| const scoped_refptr<DecoderBuffer>& buffer) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| DCHECK_NE(state_, kUninitialized);
|
| DCHECK_NE(state_, kDecodeFinished);
|
| DCHECK_NE(state_, kError);
|
|
|