Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(674)

Unified Diff: media/filters/gpu_video_decoder.cc

Issue 1083883003: Move BindToCurrentLoop from media/base/ to base/ Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix media/base/callback_holder.h compile Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | media/filters/opus_audio_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/gpu_video_decoder.cc
diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc
index 64668fa398f76ef6c38c7e6aab94d16141bfe84c..404ee6ebbc6ca9eb022405fc6dbf90321d30e583 100644
--- a/media/filters/gpu_video_decoder.cc
+++ b/media/filters/gpu_video_decoder.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include "base/bind.h"
+#include "base/bind_to_current_loop.h"
#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/cpu.h"
@@ -15,7 +16,6 @@
#include "base/stl_util.h"
#include "base/task_runner_util.h"
#include "gpu/command_buffer/common/mailbox_holder.h"
-#include "media/base/bind_to_current_loop.h"
#include "media/base/decoder_buffer.h"
#include "media/base/media_switches.h"
#include "media/base/pipeline.h"
@@ -92,7 +92,7 @@ void GpuVideoDecoder::Reset(const base::Closure& closure) {
}
DCHECK(pending_reset_cb_.is_null());
- pending_reset_cb_ = BindToCurrentLoop(closure);
+ pending_reset_cb_ = base::BindToCurrentLoop(closure);
vda_->Reset();
}
@@ -132,7 +132,7 @@ void GpuVideoDecoder::Initialize(const VideoDecoderConfig& config,
PipelineStatusCB status_cb =
base::Bind(&ReportGpuVideoDecoderInitializeStatusToUMAAndRunCB,
- BindToCurrentLoop(orig_status_cb));
+ base::BindToCurrentLoop(orig_status_cb));
bool previously_initialized = config_.IsValidConfig();
DVLOG(1) << "(Re)initializing GVD with config: "
@@ -153,7 +153,7 @@ void GpuVideoDecoder::Initialize(const VideoDecoderConfig& config,
config_ = config;
needs_bitstream_conversion_ = (config.codec() == kCodecH264);
- output_cb_ = BindToCurrentLoop(output_cb);
+ output_cb_ = base::BindToCurrentLoop(output_cb);
if (previously_initialized) {
// Reinitialization with a different config (but same codec and profile).
@@ -204,7 +204,7 @@ void GpuVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
DCHECK(pending_reset_cb_.is_null());
- DecodeCB bound_decode_cb = BindToCurrentLoop(decode_cb);
+ DecodeCB bound_decode_cb = base::BindToCurrentLoop(decode_cb);
if (state_ == kError || !vda_) {
bound_decode_cb.Run(kDecodeError);
@@ -402,7 +402,7 @@ void GpuVideoDecoder::PictureReady(const media::Picture& picture) {
scoped_refptr<VideoFrame> frame(VideoFrame::WrapNativeTexture(
make_scoped_ptr(new gpu::MailboxHolder(
pb.texture_mailbox(), decoder_texture_target_, 0 /* sync_point */)),
- BindToCurrentLoop(base::Bind(
+ base::BindToCurrentLoop(base::Bind(
&GpuVideoDecoder::ReleaseMailbox, weak_factory_.GetWeakPtr(),
factories_, picture.picture_buffer_id(), pb.texture_id())),
pb.size(), visible_rect, natural_size, timestamp,
« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | media/filters/opus_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698