| Index: media/filters/vpx_video_decoder.cc
|
| diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc
|
| index dc034005d0ca0ebc2c194f31ed22d9ce42ac6ebd..0237699c73fda7f076420566e4c31c10e4151aa5 100644
|
| --- a/media/filters/vpx_video_decoder.cc
|
| +++ b/media/filters/vpx_video_decoder.cc
|
| @@ -9,6 +9,7 @@
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| +#include "base/bind_to_current_loop.h"
|
| #include "base/callback_helpers.h"
|
| #include "base/command_line.h"
|
| #include "base/location.h"
|
| @@ -18,7 +19,6 @@
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/sys_byteorder.h"
|
| #include "base/trace_event/trace_event.h"
|
| -#include "media/base/bind_to_current_loop.h"
|
| #include "media/base/decoder_buffer.h"
|
| #include "media/base/demuxer_stream.h"
|
| #include "media/base/limits.h"
|
| @@ -181,7 +181,7 @@ base::Closure VpxVideoDecoder::MemoryPool::CreateFrameCallback(
|
| void* fb_priv_data) {
|
| VP9FrameBuffer* frame_buffer = static_cast<VP9FrameBuffer*>(fb_priv_data);
|
| ++frame_buffer->ref_cnt;
|
| - return BindToCurrentLoop(
|
| + return base::BindToCurrentLoop(
|
| base::Bind(&MemoryPool::OnVideoFrameDestroyed, this,
|
| frame_buffer));
|
| }
|
| @@ -224,7 +224,7 @@ void VpxVideoDecoder::Initialize(const VideoDecoderConfig& config,
|
| // Success!
|
| config_ = config;
|
| state_ = kNormal;
|
| - output_cb_ = BindToCurrentLoop(output_cb);
|
| + output_cb_ = base::BindToCurrentLoop(output_cb);
|
| status_cb.Run(PIPELINE_OK);
|
| }
|
|
|
| @@ -308,7 +308,7 @@ void VpxVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
|
| CHECK_NE(state_, kUninitialized);
|
| CHECK(decode_cb_.is_null()) << "Overlapping decodes are not supported.";
|
|
|
| - decode_cb_ = BindToCurrentLoop(decode_cb);
|
| + decode_cb_ = base::BindToCurrentLoop(decode_cb);
|
|
|
| if (state_ == kError) {
|
| base::ResetAndReturn(&decode_cb_).Run(kDecodeError);
|
|
|