diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 22:35:13 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 22:35:13 +0000 |
| commit | 15d206e1f9190d5af38b86d361ff0fb00f44b8bb (patch) | |
| tree | 7c9c39eeb7ff1903a03e39defc35ac7bb611db84 /content | |
| parent | 781b3b06a65572a1f84d9786314f72b89dc90009 (diff) | |
| download | chromium_src-15d206e1f9190d5af38b86d361ff0fb00f44b8bb.zip chromium_src-15d206e1f9190d5af38b86d361ff0fb00f44b8bb.tar.gz chromium_src-15d206e1f9190d5af38b86d361ff0fb00f44b8bb.tar.bz2 | |
Use GPU blacklist to control accelerated video decode.
BUG=137247,142402,141500,139683
TEST=about:gpu page
Review URL: https://chromiumcodereview.appspot.com/10832356
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152167 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/gpu/gpu_data_manager_impl.cc | 3 | ||||
| -rw-r--r-- | content/renderer/render_view_impl.cc | 16 |
2 files changed, 7 insertions, 12 deletions
diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc index a2a320c..8c05064 100644 --- a/content/browser/gpu/gpu_data_manager_impl.cc +++ b/content/browser/gpu/gpu_data_manager_impl.cc @@ -184,6 +184,9 @@ void GpuDataManagerImpl::AppendRendererCommandLine( if ((flags & content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS) && !command_line->HasSwitch(switches::kDisableAccelerated2dCanvas)) command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas); + if ((flags & content::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE) && + !command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) + command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); } void GpuDataManagerImpl::AppendGpuCommandLine( diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 9ad4497..daf5848 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -2403,18 +2403,10 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer( collection->AddAudioRenderer(audio_renderer); } - // Accelerated video decode is not enabled by default on Linux. - // crbug.com/137247 - bool use_accelerated_video_decode = false; -#if defined(OS_CHROMEOS) || defined(OS_WIN) - use_accelerated_video_decode = true; -#endif - use_accelerated_video_decode &= !CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableAcceleratedVideoDecode); - WebGraphicsContext3DCommandBufferImpl* context3d = - use_accelerated_video_decode ? - RenderThreadImpl::current()->GetGpuVDAContext3D() : - NULL; + WebGraphicsContext3DCommandBufferImpl* context3d = NULL; + if (!CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableAcceleratedVideoDecode)) + context3d = RenderThreadImpl::current()->GetGpuVDAContext3D(); if (context3d) { scoped_refptr<base::MessageLoopProxy> factories_loop = RenderThreadImpl::current()->compositor_thread() ? |