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) ||
+      (command_line->HasSwitch(switches::kDisableWebRtcHWVP8Encoding) &&
+       !base::FeatureList::IsEnabled(features::kWebRtcHWH264Encoding));

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

Previously we disabled this only based on kDisableWebRtcHWEncoding, now we
disable also if it's not set, but H264 and VP8 are disabled. But we may also
have other codecs in use, such as VP9.

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

No. For RTC, only VP8 and H264 are available on all platforms.
See
https://cs.chromium.org/chromium/src/content/renderer/media/gpu/rtc_video_enc...
So keep this to save some resources on Android.

 #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