Index: content/browser/gpu/gpu_data_manager_impl_private.cc |
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc |
index b5b44ffdbbde7421eba71ff76851f5fbcbb12533..3409fb09234c89a052301db81fe63670354608dc 100644 |
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc |
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc |
@@ -646,6 +646,11 @@ void GpuDataManagerImplPrivate::AppendRendererCommandLine( |
if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE) && |
!command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) |
command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); |
+#if defined(ENABLE_WEBRTC) |
+ if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && |
+ !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) |
+ command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); |
+#endif |
if (use_software_compositor_ && |
!command_line->HasSwitch(switches::kEnableSoftwareCompositing)) |
@@ -713,6 +718,12 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine( |
!command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) { |
command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); |
} |
+#if defined(ENABLE_WEBRTC) |
+ if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && |
+ !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) { |
+ command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); |
+ } |
+#endif |
#if defined(OS_WIN) |
// DisplayLink 7.1 and earlier can cause the GPU process to crash on startup. |