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

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 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_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 2890 matching lines...) Expand 10 before | Expand all | Expand 10 after
2901 return web_media_player_android.release(); 2901 return web_media_player_android.release();
2902 #endif // defined(OS_ANDROID) 2902 #endif // defined(OS_ANDROID)
2903 2903
2904 scoped_refptr<media::AudioRendererSink> sink; 2904 scoped_refptr<media::AudioRendererSink> sink;
2905 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { 2905 if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
2906 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()-> 2906 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()->
2907 CreateInput(routing_id_); 2907 CreateInput(routing_id_);
2908 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get(); 2908 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get();
2909 } 2909 }
2910 2910
2911 scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories; 2911 scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories =
2912 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; 2912 RenderThreadImpl::current()->GetGpuFactories();
2913 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode))
2914 context3d = RenderThreadImpl::current()->GetGpuVDAContext3D();
2915 if (context3d) {
2916 scoped_refptr<base::MessageLoopProxy> factories_loop =
2917 RenderThreadImpl::current()->compositor_message_loop_proxy();
2918 if (!factories_loop.get())
2919 factories_loop = base::MessageLoopProxy::current();
2920 GpuChannelHost* gpu_channel_host =
2921 RenderThreadImpl::current()->EstablishGpuChannelSync(
2922 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
2923 gpu_factories = new RendererGpuVideoDecoderFactories(
2924 gpu_channel_host, factories_loop, context3d);
2925 }
2926 2913
2927 webkit_media::WebMediaPlayerParams params( 2914 webkit_media::WebMediaPlayerParams params(
2928 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), 2915 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
2929 sink, gpu_factories, new RenderMediaLog()); 2916 sink, gpu_factories, new RenderMediaLog());
2930 WebMediaPlayer* media_player = 2917 WebMediaPlayer* media_player =
2931 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( 2918 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
2932 this, frame, client, AsWeakPtr(), params); 2919 this, frame, client, AsWeakPtr(), params);
2933 if (!media_player) { 2920 if (!media_player) {
2934 media_player = new webkit_media::WebMediaPlayerImpl( 2921 media_player = new webkit_media::WebMediaPlayerImpl(
2935 frame, client, AsWeakPtr(), params); 2922 frame, client, AsWeakPtr(), params);
(...skipping 3828 matching lines...) Expand 10 before | Expand all | Expand 10 after
6764 WebURL url = icon_urls[i].iconURL(); 6751 WebURL url = icon_urls[i].iconURL();
6765 if (!url.isEmpty()) 6752 if (!url.isEmpty())
6766 urls.push_back(FaviconURL(url, 6753 urls.push_back(FaviconURL(url,
6767 ToFaviconType(icon_urls[i].iconType()))); 6754 ToFaviconType(icon_urls[i].iconType())));
6768 } 6755 }
6769 SendUpdateFaviconURL(urls); 6756 SendUpdateFaviconURL(urls);
6770 } 6757 }
6771 6758
6772 6759
6773 } // namespace content 6760 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698