| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 8f656a08ac6f4dc9a8c8af529dd85a8c6e14d1d4..469608306b9050a1d827ee6b8f298ba50305f08a 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -69,6 +69,7 @@
|
| #include "content/renderer/media/media_stream_dependency_factory.h"
|
| #include "content/renderer/media/midi_message_filter.h"
|
| #include "content/renderer/media/peer_connection_tracker.h"
|
| +#include "content/renderer/media/renderer_gpu_video_accelerator_factories.h"
|
| #include "content/renderer/media/video_capture_impl_manager.h"
|
| #include "content/renderer/media/video_capture_message_filter.h"
|
| #include "content/renderer/media/webrtc_identity_service.h"
|
| @@ -86,7 +87,7 @@
|
| #include "ipc/ipc_platform_file.h"
|
| #include "media/base/audio_hardware_config.h"
|
| #include "media/base/media.h"
|
| -#include "media/filters/gpu_video_decoder_factories.h"
|
| +#include "media/filters/gpu_video_accelerator_factories.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/base/net_util.h"
|
| #include "third_party/WebKit/public/platform/WebString.h"
|
| @@ -878,22 +879,20 @@ void RenderThreadImpl::PostponeIdleNotification() {
|
| idle_notifications_to_skip_ = 2;
|
| }
|
|
|
| -scoped_refptr<RendererGpuVideoDecoderFactories>
|
| +scoped_refptr<media::GpuVideoAcceleratorFactories>
|
| RenderThreadImpl::GetGpuFactories(
|
| const scoped_refptr<base::MessageLoopProxy>& factories_loop) {
|
| DCHECK(IsMainThread());
|
|
|
| const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
|
| - scoped_refptr<RendererGpuVideoDecoderFactories> gpu_factories;
|
| + scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories;
|
| WebGraphicsContext3DCommandBufferImpl* context3d = NULL;
|
| if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode))
|
| context3d = GetGpuVDAContext3D();
|
| - if (context3d) {
|
| - GpuChannelHost* gpu_channel_host = GetGpuChannel();
|
| - if (gpu_channel_host) {
|
| - gpu_factories = new RendererGpuVideoDecoderFactories(
|
| - gpu_channel_host, factories_loop, context3d);
|
| - }
|
| + GpuChannelHost* gpu_channel_host = GetGpuChannel();
|
| + if (gpu_channel_host) {
|
| + gpu_factories = new RendererGpuVideoAcceleratorFactories(
|
| + gpu_channel_host, factories_loop, context3d);
|
| }
|
| return gpu_factories;
|
| }
|
|
|