| Index: media/filters/vpx_video_decoder.cc
|
| diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc
|
| index a3768b3dcd9a81de0b308c2962954c24b13678dd..2f0d3406125f993bd75a7041d6861cd5222de4fc 100644
|
| --- a/media/filters/vpx_video_decoder.cc
|
| +++ b/media/filters/vpx_video_decoder.cc
|
| @@ -12,7 +12,7 @@
|
| #include "base/command_line.h"
|
| #include "base/location.h"
|
| #include "base/logging.h"
|
| -#include "base/message_loop/message_loop_proxy.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/sys_byteorder.h"
|
| #include "media/base/bind_to_loop.h"
|
| @@ -68,8 +68,8 @@ static int GetThreadCount(const VideoDecoderConfig& config) {
|
| }
|
|
|
| VpxVideoDecoder::VpxVideoDecoder(
|
| - 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),
|
| vpx_codec_(NULL),
|
| @@ -83,7 +83,7 @@ VpxVideoDecoder::~VpxVideoDecoder() {
|
|
|
| void VpxVideoDecoder::Initialize(const VideoDecoderConfig& config,
|
| const PipelineStatusCB& status_cb) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| DCHECK(config.IsValidConfig());
|
| DCHECK(!config.is_encrypted());
|
| DCHECK(decode_cb_.is_null());
|
| @@ -166,7 +166,7 @@ void VpxVideoDecoder::CloseDecoder() {
|
|
|
| void VpxVideoDecoder::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.";
|
| @@ -188,7 +188,7 @@ void VpxVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
|
| }
|
|
|
| void VpxVideoDecoder::Reset(const base::Closure& closure) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| DCHECK(reset_cb_.is_null());
|
| reset_cb_ = BindToCurrentLoop(closure);
|
|
|
| @@ -200,7 +200,7 @@ void VpxVideoDecoder::Reset(const base::Closure& closure) {
|
| }
|
|
|
| void VpxVideoDecoder::Stop(const base::Closure& closure) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| base::ScopedClosureRunner runner(BindToCurrentLoop(closure));
|
|
|
| if (state_ == kUninitialized)
|
| @@ -221,7 +221,7 @@ bool VpxVideoDecoder::HasAlpha() const {
|
| }
|
|
|
| void VpxVideoDecoder::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);
|
|
|