| Index: content/renderer/media/webmediaplayer_params.h
|
| diff --git a/content/renderer/media/webmediaplayer_params.h b/content/renderer/media/webmediaplayer_params.h
|
| index 4347a4af460fd796f2e61aa1df67038cfe187b12..bf398642f7778b09e93ed90219cae608faa7d28e 100644
|
| --- a/content/renderer/media/webmediaplayer_params.h
|
| +++ b/content/renderer/media/webmediaplayer_params.h
|
| @@ -14,7 +14,7 @@ class MessageLoopProxy;
|
|
|
| namespace media {
|
| class AudioRendererSink;
|
| -class GpuVideoDecoderFactories;
|
| +class GpuVideoAcceleratorFactories;
|
| class MediaLog;
|
| }
|
|
|
| @@ -30,7 +30,7 @@ class WebMediaPlayerParams {
|
| const scoped_refptr<base::MessageLoopProxy>& message_loop_proxy,
|
| const base::Callback<void(const base::Closure&)>& defer_load_cb,
|
| const scoped_refptr<media::AudioRendererSink>& audio_renderer_sink,
|
| - const scoped_refptr<media::GpuVideoDecoderFactories>& gpu_factories,
|
| + const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories,
|
| const scoped_refptr<media::MediaLog>& media_log);
|
| ~WebMediaPlayerParams();
|
|
|
| @@ -46,7 +46,8 @@ class WebMediaPlayerParams {
|
| return audio_renderer_sink_;
|
| }
|
|
|
| - const scoped_refptr<media::GpuVideoDecoderFactories>& gpu_factories() const {
|
| + const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories()
|
| + const {
|
| return gpu_factories_;
|
| }
|
|
|
| @@ -58,7 +59,7 @@ class WebMediaPlayerParams {
|
| scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
|
| base::Callback<void(const base::Closure&)> defer_load_cb_;
|
| scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
|
| - scoped_refptr<media::GpuVideoDecoderFactories> gpu_factories_;
|
| + scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_;
|
| scoped_refptr<media::MediaLog> media_log_;
|
|
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams);
|
|
|