Restore switch kDisableWebRtcHWEncoding

content/browser/gpu/gpu_data_manager_impl_private.cc

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 e114814bd9f61f01e0561a54a0cdf24d1d932a41..b13edc52a9e86d141b8b51bc3405be6770912c8f 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -776,12 +776,17 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine(
 
 #if BUILDFLAG(ENABLE_WEBRTC)
   if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) &&
-      !command_line->HasSwitch(switches::kDisableWebRtcHWVP8Encoding) &&
+      !command_line->HasSwitch(switches::kDisableWebRtcHWVP8Encoding)) {
+    command_line->AppendSwitch(switches::kDisableWebRtcHWVP8Encoding);

[Pawel Osciak, 2016/12/15 05:45:53]

Could we use kDisableWebRtcHWEncoding only here, and use
kDisableWebRtcHWVP8Encoding in the factory in codec choice instead?

[braveyao, 2016/12/15 20:46:24]

It depends on how we decide to create VEA on Android. At present since
kDisalbeWebRtcHWEncoding will disable both VP8 and H264, then no VEA will be
created if this switch is appended. 
See my other comments in gpu_utils.cc.

[Pawel Osciak, 2016/12/20 01:49:17]

Yes, that's what should be expected from the name of the flag,
kDisableWebRtcHWEncoding should be disabling all HW WebRTC encode features.
Please also keep in mind this is not Android-only, so the decision here is not
only affecting VEA creation on Android, but on other systems as well.

[braveyao, 2016/12/20 19:09:14]

"IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE" is only
valid on Android.
https://cs.chromium.org/chromium/src/gpu/config/software_rendering_list_json....

[Pawel Osciak, 2016/12/21 01:12:57]

Regardless of what system this is for, if there are other codecs than VP8 and
H264, then I'm worried it will be surprising that this doesn't work as expected
(i.e. disabling VP8 and H264 disables all HW encoding).

By the way, I'm not sure about this, but if this is only for Android, should it
be under #if defined(OS_ANDROID)?

[braveyao, 2016/12/21 02:01:39]

Done.

GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE is only blacklisted on Android, so no
need the "#if defined(OS_ANDROID)".
And yes, on Android, only VP8 and H264 are available so far.
To make this part as same as before, I move all processing under the
IsFeatureBlacklisted() section again. PTAL.

+  }
+
+  if (!command_line->HasSwitch(switches::kDisableWebRtcHWEncoding) &&
+      command_line->HasSwitch(switches::kDisableWebRtcHWVP8Encoding) &&
       !base::FeatureList::IsEnabled(features::kWebRtcHWH264Encoding)) {
     if (gpu_preferences) {
       gpu_preferences->disable_web_rtc_hw_encoding = true;
     } else {
-      command_line->AppendSwitch(switches::kDisableWebRtcHWVP8Encoding);
+      command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding);
     }
   }
 #endif