Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2380)

Unified Diff: content/renderer/render_view_impl.cc

Issue 13890012: Integrate VDA with WebRTC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update the license of rtc_video_decoder.h 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
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | media/filters/mock_gpu_video_decoder_factories.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 27ee8d887a52d8fb345f4d6732a7dec40965a50b..7049cd269232adcd65df694ef796e65d3d77bab4 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2948,21 +2948,8 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get();
}
- scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories;
- WebGraphicsContext3DCommandBufferImpl* context3d = NULL;
- if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode))
- context3d = RenderThreadImpl::current()->GetGpuVDAContext3D();
- if (context3d) {
- scoped_refptr<base::MessageLoopProxy> factories_loop =
- RenderThreadImpl::current()->compositor_message_loop_proxy();
- if (!factories_loop.get())
- factories_loop = base::MessageLoopProxy::current();
- GpuChannelHost* gpu_channel_host =
- RenderThreadImpl::current()->EstablishGpuChannelSync(
- CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
- gpu_factories = new RendererGpuVideoDecoderFactories(
- gpu_channel_host, factories_loop, context3d);
- }
+ scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories =
+ RenderThreadImpl::current()->GetGpuFactories();
WebMediaPlayerParams params(
RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | media/filters/mock_gpu_video_decoder_factories.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698