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

Side by Side 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: fix a deadlock by calling RGVDF::CreateSharedMemory asynchronously Created 7 years, 6 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_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2892 matching lines...) Expand 10 before | Expand all | Expand 10 after
2903 return web_media_player_android.release(); 2903 return web_media_player_android.release();
2904 #endif // defined(OS_ANDROID) 2904 #endif // defined(OS_ANDROID)
2905 2905
2906 scoped_refptr<media::AudioRendererSink> sink; 2906 scoped_refptr<media::AudioRendererSink> sink;
2907 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { 2907 if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
2908 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()-> 2908 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()->
2909 CreateInput(routing_id_); 2909 CreateInput(routing_id_);
2910 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get(); 2910 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get();
2911 } 2911 }
2912 2912
2913 scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories; 2913 scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories =
2914 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; 2914 RenderThreadImpl::current()->GetGpuFactories();
2915 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode))
2916 context3d = RenderThreadImpl::current()->GetGpuVDAContext3D();
2917 if (context3d) {
2918 scoped_refptr<base::MessageLoopProxy> factories_loop =
2919 RenderThreadImpl::current()->compositor_message_loop_proxy();
2920 if (!factories_loop.get())
2921 factories_loop = base::MessageLoopProxy::current();
2922 GpuChannelHost* gpu_channel_host =
2923 RenderThreadImpl::current()->EstablishGpuChannelSync(
2924 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
2925 gpu_factories = new RendererGpuVideoDecoderFactories(
2926 gpu_channel_host, factories_loop, context3d);
2927 }
2928 2915
2929 webkit_media::WebMediaPlayerParams params( 2916 webkit_media::WebMediaPlayerParams params(
2930 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), 2917 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
2931 sink, gpu_factories, new RenderMediaLog()); 2918 sink, gpu_factories, new RenderMediaLog());
2932 WebMediaPlayer* media_player = 2919 WebMediaPlayer* media_player =
2933 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( 2920 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
2934 this, frame, client, AsWeakPtr(), params); 2921 this, frame, client, AsWeakPtr(), params);
2935 if (!media_player) { 2922 if (!media_player) {
2936 media_player = new webkit_media::WebMediaPlayerImpl( 2923 media_player = new webkit_media::WebMediaPlayerImpl(
2937 frame, client, AsWeakPtr(), params); 2924 frame, client, AsWeakPtr(), params);
(...skipping 3819 matching lines...) Expand 10 before | Expand all | Expand 10 after
6757 WebURL url = icon_urls[i].iconURL(); 6744 WebURL url = icon_urls[i].iconURL();
6758 if (!url.isEmpty()) 6745 if (!url.isEmpty())
6759 urls.push_back(FaviconURL(url, 6746 urls.push_back(FaviconURL(url,
6760 ToFaviconType(icon_urls[i].iconType()))); 6747 ToFaviconType(icon_urls[i].iconType())));
6761 } 6748 }
6762 SendUpdateFaviconURL(urls); 6749 SendUpdateFaviconURL(urls);
6763 } 6750 }
6764 6751
6765 6752
6766 } // namespace content 6753 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698