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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 19534002: Make RendererGpuVideoDecoderFactories live on arbitrary threads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address review comments 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
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 31cb7bb3e5bb3b57ec149b16544b50d57537a0be..8e250b9d461bf4bc1e243d7f1300c97b0312d513 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -69,7 +69,6 @@
#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_decoder_factories.h"
#include "content/renderer/media/video_capture_impl_manager.h"
#include "content/renderer/media/video_capture_message_filter.h"
#include "content/renderer/memory_benchmarking_extension.h"
@@ -886,20 +885,17 @@ void RenderThreadImpl::PostponeIdleNotification() {
idle_notifications_to_skip_ = 2;
}
-scoped_refptr<media::GpuVideoDecoder::Factories>
-RenderThreadImpl::GetGpuFactories() {
+scoped_refptr<content::RendererGpuVideoDecoderFactories>
scherkus (not reviewing) 2013/07/19 18:13:58 don't need content namespace
wuchengli 2013/07/20 06:04:14 Changed back to media::GpuVideoDecoder::Factories.
+RenderThreadImpl::GetGpuFactories(
+ scoped_refptr<base::MessageLoopProxy> factories_loop) {
DCHECK(IsMainThread());
const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
- scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories;
+ scoped_refptr<content::RendererGpuVideoDecoderFactories> gpu_factories;
scherkus (not reviewing) 2013/07/19 18:13:58 you don't need content namespace
wuchengli 2013/07/20 06:04:14 Changed back to media::GpuVideoDecoder::Factories.
WebGraphicsContext3DCommandBufferImpl* context3d = NULL;
if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode))
context3d = GetGpuVDAContext3D();
if (context3d) {
- scoped_refptr<base::MessageLoopProxy> factories_loop =
- compositor_message_loop_proxy();
- if (!factories_loop.get())
- factories_loop = base::MessageLoopProxy::current();
GpuChannelHost* gpu_channel_host = GetGpuChannel();
if (gpu_channel_host) {
gpu_factories = new RendererGpuVideoDecoderFactories(
@@ -1220,7 +1216,8 @@ RenderThreadImpl::GetMediaStreamDependencyFactory() {
#if defined(ENABLE_WEBRTC)
if (!media_stream_factory_) {
media_stream_factory_.reset(new MediaStreamDependencyFactory(
- vc_manager_.get(), p2p_socket_dispatcher_.get()));
+ vc_manager_.get(), p2p_socket_dispatcher_.get(),
+ GetMediaThreadMessageLoopProxy()));
}
#endif
return media_stream_factory_.get();

Powered by Google App Engine
This is Rietveld 408576698