Chromium Code Reviews| Index: content/renderer/render_view_impl.cc |
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
| index bcd537d6b693d3f9c05dcf1fca0e4d72fd8ebff3..d8fff7b434f1273086a437fca92769a2d1394ba5 100644 |
| --- a/content/renderer/render_view_impl.cc |
| +++ b/content/renderer/render_view_impl.cc |
| @@ -2367,11 +2367,22 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer( |
| collection->AddAudioRenderer(audio_renderer); |
| } |
| + bool use_accelerated_video_decode; |
|
jam
2012/07/23 22:51:31
nit: it would be more concise to write this as
b
Ami GONE FROM CHROMIUM
2012/07/23 22:55:51
Yeah; my thought here was that this way would make
|
| +#if defined(OS_WIN) |
| + use_accelerated_video_decode = false; |
| +#elif defined(OS_MACOSX) |
| + use_accelerated_video_decode = false; |
| +#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
| + use_accelerated_video_decode = false; |
| +#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) |
| + use_accelerated_video_decode = true; |
| +#endif |
| + use_accelerated_video_decode &= !CommandLine::ForCurrentProcess()->HasSwitch( |
| + switches::kDisableAcceleratedVideoDecode); |
| base::WeakPtr<WebGraphicsContext3DCommandBufferImpl> context3d = |
| - !CommandLine::ForCurrentProcess()->HasSwitch( |
| - switches::kEnableAcceleratedVideoDecode) ? |
| - base::WeakPtr<WebGraphicsContext3DCommandBufferImpl>() : |
| - RenderThreadImpl::current()->GetGpuVDAContext3D(); |
| + use_accelerated_video_decode ? |
| + RenderThreadImpl::current()->GetGpuVDAContext3D() : |
| + base::WeakPtr<WebGraphicsContext3DCommandBufferImpl>(); |
| if (context3d) { |
| MessageLoop* factories_loop = |
| RenderThreadImpl::current()->compositor_thread() ? |