content/renderer/render_view_impl.cc - Issue 22875014: Merge 217276 "Add media::VideoEncodeAccelerator with WebRTC inte..."

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 22875014: Merge 217276 "Add media::VideoEncodeAccelerator with WebRTC inte..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1599/src/

Patch Set: 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

Index: content/renderer/render_view_impl.cc

===================================================================

--- content/renderer/render_view_impl.cc (revision 217687)

+++ content/renderer/render_view_impl.cc (working copy)

@@ -132,7 +132,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"

@@ -3066,7 +3066,7 @@

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());

« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | media/filters/gpu_video_accelerator_factories.h » ('j') | no next file with comments »