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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 13890012: Integrate VDA with WebRTC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix a deadlock by calling RGVDF::CreateSharedMemory asynchronously 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "content/renderer/gpu/compositor_output_surface.h" 58 #include "content/renderer/gpu/compositor_output_surface.h"
59 #include "content/renderer/gpu/gpu_benchmarking_extension.h" 59 #include "content/renderer/gpu/gpu_benchmarking_extension.h"
60 #include "content/renderer/gpu/input_event_filter.h" 60 #include "content/renderer/gpu/input_event_filter.h"
61 #include "content/renderer/gpu/input_handler_manager.h" 61 #include "content/renderer/gpu/input_handler_manager.h"
62 #include "content/renderer/media/audio_input_message_filter.h" 62 #include "content/renderer/media/audio_input_message_filter.h"
63 #include "content/renderer/media/audio_message_filter.h" 63 #include "content/renderer/media/audio_message_filter.h"
64 #include "content/renderer/media/audio_renderer_mixer_manager.h" 64 #include "content/renderer/media/audio_renderer_mixer_manager.h"
65 #include "content/renderer/media/media_stream_center.h" 65 #include "content/renderer/media/media_stream_center.h"
66 #include "content/renderer/media/media_stream_dependency_factory.h" 66 #include "content/renderer/media/media_stream_dependency_factory.h"
67 #include "content/renderer/media/peer_connection_tracker.h" 67 #include "content/renderer/media/peer_connection_tracker.h"
68 #include "content/renderer/media/renderer_gpu_video_decoder_factories.h"
68 #include "content/renderer/media/video_capture_impl_manager.h" 69 #include "content/renderer/media/video_capture_impl_manager.h"
69 #include "content/renderer/media/video_capture_message_filter.h" 70 #include "content/renderer/media/video_capture_message_filter.h"
70 #include "content/renderer/memory_benchmarking_extension.h" 71 #include "content/renderer/memory_benchmarking_extension.h"
71 #include "content/renderer/p2p/socket_dispatcher.h" 72 #include "content/renderer/p2p/socket_dispatcher.h"
72 #include "content/renderer/plugin_channel_host.h" 73 #include "content/renderer/plugin_channel_host.h"
73 #include "content/renderer/render_process_impl.h" 74 #include "content/renderer/render_process_impl.h"
74 #include "content/renderer/render_view_impl.h" 75 #include "content/renderer/render_view_impl.h"
75 #include "content/renderer/renderer_webkitplatformsupport_impl.h" 76 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
76 #include "content/renderer/skia_benchmarking_extension.h" 77 #include "content/renderer/skia_benchmarking_extension.h"
77 #include "grit/content_resources.h" 78 #include "grit/content_resources.h"
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 bool RenderThreadImpl::ResolveProxy(const GURL& url, std::string* proxy_list) { 842 bool RenderThreadImpl::ResolveProxy(const GURL& url, std::string* proxy_list) {
842 bool result = false; 843 bool result = false;
843 Send(new ViewHostMsg_ResolveProxy(url, &result, proxy_list)); 844 Send(new ViewHostMsg_ResolveProxy(url, &result, proxy_list));
844 return result; 845 return result;
845 } 846 }
846 847
847 void RenderThreadImpl::PostponeIdleNotification() { 848 void RenderThreadImpl::PostponeIdleNotification() {
848 idle_notifications_to_skip_ = 2; 849 idle_notifications_to_skip_ = 2;
849 } 850 }
850 851
852 scoped_refptr<media::GpuVideoDecoder::Factories>
853 RenderThreadImpl::GetGpuFactories() {
854 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
855 scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories;
856 WebGraphicsContext3DCommandBufferImpl* context3d = NULL;
857 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode))
858 context3d = RenderThreadImpl::current()->GetGpuVDAContext3D();
859 if (context3d) {
860 scoped_refptr<base::MessageLoopProxy> factories_loop =
861 RenderThreadImpl::current()->compositor_message_loop_proxy();
862 if (!factories_loop.get())
863 factories_loop = base::MessageLoopProxy::current();
864 GpuChannelHost* gpu_channel_host =
865 RenderThreadImpl::current()->EstablishGpuChannelSync(
866 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
867 gpu_factories = new RendererGpuVideoDecoderFactories(
868 gpu_channel_host, factories_loop, context3d);
869 }
870 return gpu_factories;
871 }
872
851 /* static */ 873 /* static */
852 void RenderThreadImpl::OnGpuVDAContextLoss() { 874 void RenderThreadImpl::OnGpuVDAContextLoss() {
853 RenderThreadImpl* self = RenderThreadImpl::current(); 875 RenderThreadImpl* self = RenderThreadImpl::current();
854 DCHECK(self); 876 DCHECK(self);
855 if (!self->gpu_vda_context3d_) 877 if (!self->gpu_vda_context3d_)
856 return; 878 return;
857 if (self->compositor_message_loop_proxy().get()) { 879 if (self->compositor_message_loop_proxy().get()) {
858 self->compositor_message_loop_proxy() 880 self->compositor_message_loop_proxy()
859 ->DeleteSoon(FROM_HERE, self->gpu_vda_context3d_.release()); 881 ->DeleteSoon(FROM_HERE, self->gpu_vda_context3d_.release());
860 } else { 882 } else {
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
1232 1254
1233 void RenderThreadImpl::SetFlingCurveParameters( 1255 void RenderThreadImpl::SetFlingCurveParameters(
1234 const std::vector<float>& new_touchpad, 1256 const std::vector<float>& new_touchpad,
1235 const std::vector<float>& new_touchscreen) { 1257 const std::vector<float>& new_touchscreen) {
1236 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, 1258 webkit_platform_support_->SetFlingCurveParameters(new_touchpad,
1237 new_touchscreen); 1259 new_touchscreen);
1238 1260
1239 } 1261 }
1240 1262
1241 } // namespace content 1263 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698