Android: enable WebRTC HW H264 with a flag by default

content/renderer/media/gpu/rtc_video_encoder_factory.cc

 // Copyright 2013 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/renderer/media/gpu/rtc_video_encoder_factory.h"
 
 #include "base/command_line.h"
+#include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/feature_h264_with_openh264_ffmpeg.h"
 #include "content/renderer/media/gpu/rtc_video_encoder.h"
 #include "media/gpu/ipc/client/gpu_video_encode_accelerator_host.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "media/video/video_encode_accelerator.h"
 
 namespace content {
 
 namespace {
-bool IsCodecDisabledByCommandLine(const base::CommandLine* cmd_line,
-                                  const std::string codec_name) {
-  if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding))
-    return false;
-
-  const std::string codec_filter =
-      cmd_line->GetSwitchValueASCII(switches::kDisableWebRtcHWEncoding);
-  return codec_filter.empty() || codec_filter == codec_name;
-}
 
 // Translate from media::VideoEncodeAccelerator::SupportedProfile to
 // one or more instances of cricket::WebRtcVideoEncoderFactory::VideoCodec
 void VEAToWebRTCCodecs(
     std::vector<cricket::WebRtcVideoEncoderFactory::VideoCodec>* codecs,
     const media::VideoEncodeAccelerator::SupportedProfile& profile) {
   const int width = profile.max_resolution.width();
   const int height = profile.max_resolution.height();
   const int fps = profile.max_framerate_numerator;
   DCHECK_EQ(profile.max_framerate_denominator, 1U);
 
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (profile.profile >= media::VP8PROFILE_MIN &&
       profile.profile <= media::VP8PROFILE_MAX) {
-    if (!IsCodecDisabledByCommandLine(cmd_line,
-                                      switches::kDisableWebRtcHWEncodingVPx)) {
+    if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
       codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec(
           webrtc::kVideoCodecVP8, "VP8", width, height, fps));
     }
   } else if (profile.profile >= media::H264PROFILE_MIN &&
              profile.profile <= media::H264PROFILE_MAX) {
     // Enable H264 HW encode for WebRTC when SW fallback is available, which is
     // checked by kWebRtcH264WithOpenH264FFmpeg flag. This check should be
     // removed when SW implementation is fully enabled.
     bool webrtc_h264_sw_enabled = false;
 #if BUILDFLAG(RTC_USE_H264) && !defined(MEDIA_DISABLE_FFMPEG)
     webrtc_h264_sw_enabled =
         base::FeatureList::IsEnabled(kWebRtcH264WithOpenH264FFmpeg);
 #endif  // BUILDFLAG(RTC_USE_H264) && !defined(MEDIA_DISABLE_FFMPEG)
     if (webrtc_h264_sw_enabled ||
-        !IsCodecDisabledByCommandLine(cmd_line,
-                                      switches::kDisableWebRtcHWEncodingH264)) {
+        base::FeatureList::IsEnabled(features::kWebRtcHWH264EncodingAndroid)) {
       codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec(

[Pawel Osciak, 2016/12/06 04:13:00]

Perhaps I'm misreading the logic of the decision tree here, but it looks like
right now having kDisableWebRtcHWEncoding only disables HW VP8 encode, but does
not disable H264 HW encode?

[braveyao, 2016/12/06 17:50:13]

That's true. We want to control H264 separately from other HW codecs(currently
only VP8) on Android. So a new feature added for H264 (enabled by default) and
the original kDisableWebRtcHWEncoding will only disable other codecs, e.g. VP8.

[piman, 2016/12/06 21:29:42]

Should we rename the flag to avoid confusion? E.g. kDisableWebRtcVP8HWEncoding

[braveyao, 2016/12/07 17:07:37]

Done.

           webrtc::kVideoCodecH264, "H264", width, height, fps));
     }
   }
 }
 
 }  // anonymous namespace
 
 RTCVideoEncoderFactory::RTCVideoEncoderFactory(
     media::GpuVideoAcceleratorFactories* gpu_factories)
     : gpu_factories_(gpu_factories) {
@@ skipping 18 matching lines @@
 RTCVideoEncoderFactory::codecs() const {
   return codecs_;
 }
 
 void RTCVideoEncoderFactory::DestroyVideoEncoder(
     webrtc::VideoEncoder* encoder) {
   delete encoder;
 }
 
 }  // namespace content