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

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: address review comments and update tests 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 2882 matching lines...) Expand 10 before | Expand all | Expand 10 after
2893 return web_media_player_android.release(); 2893 return web_media_player_android.release();
2894 #endif // defined(OS_ANDROID) 2894 #endif // defined(OS_ANDROID)
2895 2895
2896 scoped_refptr<media::AudioRendererSink> sink; 2896 scoped_refptr<media::AudioRendererSink> sink;
2897 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { 2897 if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
2898 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()-> 2898 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()->
2899 CreateInput(routing_id_); 2899 CreateInput(routing_id_);
2900 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get(); 2900 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get();
2901 } 2901 }
2902 2902
2903 scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories; 2903 scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories =
2904 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; 2904 RenderThreadImpl::current()->GetGpuFactories();
2905 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode))
2906 context3d = RenderThreadImpl::current()->GetGpuVDAContext3D();
2907 if (context3d) {
2908 scoped_refptr<base::MessageLoopProxy> factories_loop =
2909 RenderThreadImpl::current()->compositor_message_loop_proxy();
2910 if (!factories_loop.get())
2911 factories_loop = base::MessageLoopProxy::current();
2912 GpuChannelHost* gpu_channel_host =
2913 RenderThreadImpl::current()->EstablishGpuChannelSync(
2914 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
2915 gpu_factories = new RendererGpuVideoDecoderFactories(
2916 gpu_channel_host, factories_loop, context3d);
2917 }
2918 2905
2919 webkit_media::WebMediaPlayerParams params( 2906 webkit_media::WebMediaPlayerParams params(
2920 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), 2907 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
2921 sink, gpu_factories, new RenderMediaLog()); 2908 sink, gpu_factories, new RenderMediaLog());
2922 WebMediaPlayer* media_player = 2909 WebMediaPlayer* media_player =
2923 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( 2910 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
2924 this, frame, client, AsWeakPtr(), params); 2911 this, frame, client, AsWeakPtr(), params);
2925 if (!media_player) { 2912 if (!media_player) {
2926 media_player = new webkit_media::WebMediaPlayerImpl( 2913 media_player = new webkit_media::WebMediaPlayerImpl(
2927 frame, client, AsWeakPtr(), params); 2914 frame, client, AsWeakPtr(), params);
(...skipping 3803 matching lines...) Expand 10 before | Expand all | Expand 10 after
6731 WebURL url = icon_urls[i].iconURL(); 6718 WebURL url = icon_urls[i].iconURL();
6732 if (!url.isEmpty()) 6719 if (!url.isEmpty())
6733 urls.push_back(FaviconURL(url, 6720 urls.push_back(FaviconURL(url,
6734 ToFaviconType(icon_urls[i].iconType()))); 6721 ToFaviconType(icon_urls[i].iconType())));
6735 } 6722 }
6736 SendUpdateFaviconURL(urls); 6723 SendUpdateFaviconURL(urls);
6737 } 6724 }
6738 6725
6739 6726
6740 } // namespace content 6727 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698