Index: media/filters/ffmpeg_audio_decoder.cc |
diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc |
index a302e41138e8a900c871a847281500fa2cfd5ac8..b137deeec802398e6f11ff14c0ae38ba6bb2ebd1 100644 |
--- a/media/filters/ffmpeg_audio_decoder.cc |
+++ b/media/filters/ffmpeg_audio_decoder.cc |
@@ -4,13 +4,13 @@ |
#include "media/filters/ffmpeg_audio_decoder.h" |
+#include "base/bind_to_current_loop.h" |
#include "base/callback_helpers.h" |
#include "base/single_thread_task_runner.h" |
#include "media/base/audio_buffer.h" |
#include "media/base/audio_bus.h" |
#include "media/base/audio_decoder_config.h" |
#include "media/base/audio_discard_helper.h" |
-#include "media/base/bind_to_current_loop.h" |
#include "media/base/decoder_buffer.h" |
#include "media/base/limits.h" |
#include "media/base/sample_format.h" |
@@ -156,7 +156,7 @@ void FFmpegAudioDecoder::Initialize(const AudioDecoderConfig& config, |
FFmpegGlue::InitializeFFmpeg(); |
config_ = config; |
- PipelineStatusCB initialize_cb = BindToCurrentLoop(status_cb); |
+ PipelineStatusCB initialize_cb = base::BindToCurrentLoop(status_cb); |
if (!config.IsValidConfig() || !ConfigureDecoder()) { |
initialize_cb.Run(DECODER_ERROR_NOT_SUPPORTED); |
@@ -164,7 +164,7 @@ void FFmpegAudioDecoder::Initialize(const AudioDecoderConfig& config, |
} |
// Success! |
- output_cb_ = BindToCurrentLoop(output_cb); |
+ output_cb_ = base::BindToCurrentLoop(output_cb); |
state_ = kNormal; |
initialize_cb.Run(PIPELINE_OK); |
} |
@@ -174,7 +174,7 @@ void FFmpegAudioDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer, |
DCHECK(task_runner_->BelongsToCurrentThread()); |
DCHECK(!decode_cb.is_null()); |
CHECK_NE(state_, kUninitialized); |
- DecodeCB decode_cb_bound = BindToCurrentLoop(decode_cb); |
+ DecodeCB decode_cb_bound = base::BindToCurrentLoop(decode_cb); |
if (state_ == kError) { |
decode_cb_bound.Run(kDecodeError); |