Restore switch kDisableWebRtcHWEncoding

content/public/browser/gpu_utils.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/browser/gpu_utils.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
@@ skipping 29 matching lines @@
   gpu_preferences.ui_prioritize_in_gpu_process =
       command_line->HasSwitch(switches::kUIPrioritizeInGpuProcess);
   gpu_preferences.disable_accelerated_video_decode =
       command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
 #if defined(OS_CHROMEOS)
   gpu_preferences.disable_vaapi_accelerated_video_encode =
       command_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode);
 #endif
 #if BUILDFLAG(ENABLE_WEBRTC)
   gpu_preferences.disable_web_rtc_hw_encoding =
-      command_line->HasSwitch(switches::kDisableWebRtcHWVP8Encoding) &&
-      !base::FeatureList::IsEnabled(features::kWebRtcHWH264Encoding);
+      command_line->HasSwitch(switches::kDisableWebRtcHWEncoding) ||

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

Could we keep only kDisableWebRtcHWEncoding here as well please?

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

Probably we can. The consequence, as I mentioned yesterday, will be if we
disable H264(not append kDisableWebRtcHWEncoding. And so far VP8 is  disabled by
default), then VEA will be created even no one will use it. This changed the
previous behavior.
What if we always create VEA on Android? Will it add CPU load or power
consumption? I suppose the principle is we only create the resource when we
about to use it.

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

These switches control not only Android. VP8 encode is enabled by default on
CrOS.
Sorry, I'm not familiar how this would affect Android in particular for
power/CPU, but if you needed to disable encoding in general and not create a VEA
at all, kDisableWebRtcHWEncoding should be more appropriate, instead of a
codec-specific flag.

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

Again on CrOS, nothing is changed. You control with kDisableWebRtcHWEncoing
only.

On Android, we can control VEA creation not only by kDisableWebRtcHWEncoding as
before, but also by checking if none of VP8/H264 is enabled. This just covers
another use case.

+      (command_line->HasSwitch(switches::kDisableWebRtcHWVP8Encoding) &&
+       !base::FeatureList::IsEnabled(features::kWebRtcHWH264Encoding));
 #endif
 #if defined(OS_WIN)
   uint32_t enable_accelerated_vpx_decode_val =
       gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
   if (GetUintFromSwitch(command_line, switches::kEnableAcceleratedVpxDecode,
                         &enable_accelerated_vpx_decode_val)) {
     gpu_preferences.enable_accelerated_vpx_decode =
         static_cast<gpu::GpuPreferences::VpxDecodeVendors>(
             enable_accelerated_vpx_decode_val);
   }
@@ skipping 47 matching lines @@
   gpu_preferences.enable_gpu_service_tracing =
       command_line->HasSwitch(switches::kEnableGPUServiceTracing);
   gpu_preferences.use_passthrough_cmd_decoder =
       command_line->HasSwitch(switches::kUsePassthroughCmdDecoder);
   // Some of these preferences are set or adjusted in
   // GpuDataManagerImplPrivate::AppendGpuCommandLine.
   return gpu_preferences;
 }
 
 }  // namespace content