OLD | NEW |
---|---|
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 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 2349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2360 // from the perspective of the audio renderer. | 2360 // from the perspective of the audio renderer. |
2361 audio_source_provider = new RenderAudioSourceProvider(); | 2361 audio_source_provider = new RenderAudioSourceProvider(); |
2362 | 2362 |
2363 // Add the chrome specific audio renderer, using audio_source_provider | 2363 // Add the chrome specific audio renderer, using audio_source_provider |
2364 // as the sink. | 2364 // as the sink. |
2365 media::AudioRendererImpl* audio_renderer = | 2365 media::AudioRendererImpl* audio_renderer = |
2366 new media::AudioRendererImpl(audio_source_provider); | 2366 new media::AudioRendererImpl(audio_source_provider); |
2367 collection->AddAudioRenderer(audio_renderer); | 2367 collection->AddAudioRenderer(audio_renderer); |
2368 } | 2368 } |
2369 | 2369 |
2370 bool use_accelerated_video_decode = false; | |
2371 #if defined(OS_CHROMEOS) | |
Ami GONE FROM CHROMIUM
2012/07/23 23:33:08
Turned on for cros/x86 (as well as cros/arm) per c
| |
2372 use_accelerated_video_decode = true; | |
2373 #endif | |
2374 use_accelerated_video_decode &= !CommandLine::ForCurrentProcess()->HasSwitch( | |
2375 switches::kDisableAcceleratedVideoDecode); | |
2370 base::WeakPtr<WebGraphicsContext3DCommandBufferImpl> context3d = | 2376 base::WeakPtr<WebGraphicsContext3DCommandBufferImpl> context3d = |
2371 !CommandLine::ForCurrentProcess()->HasSwitch( | 2377 use_accelerated_video_decode ? |
2372 switches::kEnableAcceleratedVideoDecode) ? | 2378 RenderThreadImpl::current()->GetGpuVDAContext3D() : |
2373 base::WeakPtr<WebGraphicsContext3DCommandBufferImpl>() : | 2379 base::WeakPtr<WebGraphicsContext3DCommandBufferImpl>(); |
2374 RenderThreadImpl::current()->GetGpuVDAContext3D(); | |
2375 if (context3d) { | 2380 if (context3d) { |
2376 MessageLoop* factories_loop = | 2381 MessageLoop* factories_loop = |
2377 RenderThreadImpl::current()->compositor_thread() ? | 2382 RenderThreadImpl::current()->compositor_thread() ? |
2378 RenderThreadImpl::current()->compositor_thread()->GetWebThread() | 2383 RenderThreadImpl::current()->compositor_thread()->GetWebThread() |
2379 ->message_loop() : | 2384 ->message_loop() : |
2380 MessageLoop::current(); | 2385 MessageLoop::current(); |
2381 GpuChannelHost* gpu_channel_host = | 2386 GpuChannelHost* gpu_channel_host = |
2382 RenderThreadImpl::current()->EstablishGpuChannelSync( | 2387 RenderThreadImpl::current()->EstablishGpuChannelSync( |
2383 content::CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); | 2388 content::CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); |
2384 collection->AddVideoDecoder(new media::GpuVideoDecoder( | 2389 collection->AddVideoDecoder(new media::GpuVideoDecoder( |
(...skipping 3320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5705 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5710 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
5706 return !!RenderThreadImpl::current()->compositor_thread(); | 5711 return !!RenderThreadImpl::current()->compositor_thread(); |
5707 } | 5712 } |
5708 | 5713 |
5709 void RenderViewImpl::OnJavaBridgeInit() { | 5714 void RenderViewImpl::OnJavaBridgeInit() { |
5710 DCHECK(!java_bridge_dispatcher_); | 5715 DCHECK(!java_bridge_dispatcher_); |
5711 #if defined(ENABLE_JAVA_BRIDGE) | 5716 #if defined(ENABLE_JAVA_BRIDGE) |
5712 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5717 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
5713 #endif | 5718 #endif |
5714 } | 5719 } |
OLD | NEW |