Index: content/renderer/media/rtc_video_decoder.cc |
diff --git a/content/renderer/media/rtc_video_decoder.cc b/content/renderer/media/rtc_video_decoder.cc |
index e89cad96eace2589d638e9a5be3b63c9d42d5c12..c1a0e0535de545460385358786e55652dee1f439 100644 |
--- a/content/renderer/media/rtc_video_decoder.cc |
+++ b/content/renderer/media/rtc_video_decoder.cc |
@@ -13,7 +13,7 @@ |
#include "base/task_runner_util.h" |
#include "content/child/child_thread.h" |
#include "media/base/bind_to_loop.h" |
-#include "media/filters/gpu_video_decoder_factories.h" |
+#include "media/filters/gpu_video_accelerator_factories.h" |
#include "third_party/webrtc/system_wrappers/interface/ref_count.h" |
namespace content { |
@@ -69,7 +69,7 @@ RTCVideoDecoder::BufferData::BufferData() {} |
RTCVideoDecoder::BufferData::~BufferData() {} |
RTCVideoDecoder::RTCVideoDecoder( |
- const scoped_refptr<media::GpuVideoDecoderFactories>& factories) |
+ const scoped_refptr<media::GpuVideoAcceleratorFactories>& factories) |
: weak_factory_(this), |
weak_this_(weak_factory_.GetWeakPtr()), |
factories_(factories), |
@@ -119,7 +119,7 @@ RTCVideoDecoder::~RTCVideoDecoder() { |
scoped_ptr<RTCVideoDecoder> RTCVideoDecoder::Create( |
webrtc::VideoCodecType type, |
- const scoped_refptr<media::GpuVideoDecoderFactories>& factories) { |
+ const scoped_refptr<media::GpuVideoAcceleratorFactories>& factories) { |
scoped_ptr<RTCVideoDecoder> decoder; |
// Convert WebRTC codec type to media codec profile. |
media::VideoCodecProfile profile; |
@@ -133,8 +133,8 @@ scoped_ptr<RTCVideoDecoder> RTCVideoDecoder::Create( |
} |
decoder.reset(new RTCVideoDecoder(factories)); |
- decoder->vda_ |
- .reset(factories->CreateVideoDecodeAccelerator(profile, decoder.get())); |
+ decoder->vda_ = |
+ factories->CreateVideoDecodeAccelerator(profile, decoder.get()).Pass(); |
// vda can be NULL if VP8 is not supported. |
if (decoder->vda_ != NULL) { |
decoder->state_ = INITIALIZED; |
@@ -404,7 +404,7 @@ scoped_refptr<media::VideoFrame> RTCVideoDecoder::CreateVideoFrame( |
visible_rect, |
natural_size, |
timestamp_ms, |
- base::Bind(&media::GpuVideoDecoderFactories::ReadPixels, |
+ base::Bind(&media::GpuVideoAcceleratorFactories::ReadPixels, |
factories_, |
pb.texture_id(), |
decoder_texture_target_, |