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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_view_impl.cc

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

Patch Set: 6243184e VEA reentrancy. Created 7 years, 4 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/common/gpu/media/gpu_video_encode_accelerator.cc ('K') | « content/renderer/render_thread_impl.cc ('k') | media/base/video_frame.cc » ('j') | media/video/video_encode_accelerator.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_view_impl.cc

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

index 5299bdd7977d12b64c527706ea04a5bef32396bd..cfb7997bef8c239f42694c4f97cc8fbf877050d0 100644

--- a/content/renderer/render_view_impl.cc

+++ b/content/renderer/render_view_impl.cc

@@ -131,7 +131,7 @@

#include "media/base/filter_collection.h"

#include "media/base/media_switches.h"

#include "media/filters/audio_renderer_impl.h"

-#include "media/filters/gpu_video_decoder_factories.h"

+#include "media/filters/gpu_video_accelerator_factories.h"

#include "net/base/data_url.h"

#include "net/base/escape.h"

#include "net/base/net_errors.h"

@@ -3059,7 +3059,7 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(

DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get();

}

- scoped_refptr<media::GpuVideoDecoderFactories> gpu_factories =

+ scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories =

RenderThreadImpl::current()->GetGpuFactories(

RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy());