content/renderer/render_thread_impl.cc - Issue 20632002: Add media::VideoEncodeAccelerator with WebRTC integration

Unified Diff: content/renderer/render_thread_impl.cc

Issue 20632002: Add media::VideoEncodeAccelerator with WebRTC integration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn

Patch Set: 7fd9dbd5 More debugging statements, some fixes Created 7 years, 5 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

« content/renderer/render_thread_impl.h ('K') | « content/renderer/render_thread_impl.h ('k') | content/renderer/render_view_impl.cc » ('j') | media/filters/gpu_video_accelerator_factories.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_thread_impl.cc

diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc

index 7adc22fa4cadedd8682979791687b9cca8587f88..2145b0862dcc129142bf5cb00ef2f44c09856b39 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"

@@ -900,22 +901,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);

Ami GONE FROM CHROMIUM 2013/07/31 23:01:12 What's the use of allocating a RendererGpuVideoAcc

sheu 2013/08/02 01:27:49 HW-accelerated decoding requires a context, since

}

return gpu_factories;

}