Index: media/filters/gpu_video_decoder.cc |
diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc |
index e77f9888cce59cf55214abbeb6e85e77949f08f7..9e4c760ea44be4548403582ca4e086906089b225 100644 |
--- a/media/filters/gpu_video_decoder.cc |
+++ b/media/filters/gpu_video_decoder.cc |
@@ -17,7 +17,7 @@ |
#include "media/base/pipeline.h" |
#include "media/base/pipeline_status.h" |
#include "media/base/video_decoder_config.h" |
-#include "media/filters/gpu_video_decoder_factories.h" |
+#include "media/filters/gpu_video_accelerator_factories.h" |
namespace media { |
@@ -52,7 +52,7 @@ GpuVideoDecoder::BufferData::BufferData( |
GpuVideoDecoder::BufferData::~BufferData() {} |
GpuVideoDecoder::GpuVideoDecoder( |
- const scoped_refptr<GpuVideoDecoderFactories>& factories) |
+ const scoped_refptr<GpuVideoAcceleratorFactories>& factories) |
: needs_bitstream_conversion_(false), |
gvd_loop_proxy_(factories->GetMessageLoop()), |
weak_factory_(this), |
@@ -149,7 +149,8 @@ void GpuVideoDecoder::Initialize(const VideoDecoderConfig& config, |
return; |
} |
- vda_.reset(factories_->CreateVideoDecodeAccelerator(config.profile(), this)); |
+ vda_ = |
+ factories_->CreateVideoDecodeAccelerator(config.profile(), this).Pass(); |
if (!vda_) { |
status_cb.Run(DECODER_ERROR_NOT_SUPPORTED); |
return; |
@@ -414,7 +415,7 @@ void GpuVideoDecoder::PictureReady(const media::Picture& picture) { |
visible_rect, |
natural_size, |
timestamp, |
- base::Bind(&GpuVideoDecoderFactories::ReadPixels, |
+ base::Bind(&GpuVideoAcceleratorFactories::ReadPixels, |
factories_, |
pb.texture_id(), |
decoder_texture_target_, |