Android: enable WebRTC HW H264 with a flag by default

content/renderer/media/gpu/rtc_video_encoder_factory.cc

Index: content/renderer/media/gpu/rtc_video_encoder_factory.cc
diff --git a/content/renderer/media/gpu/rtc_video_encoder_factory.cc b/content/renderer/media/gpu/rtc_video_encoder_factory.cc
index 4124c186fb912248a0e5a8b6dc7a2290325b0b20..44e5bd3c0df1a16802bbfd51a698efa9c22667e7 100644
--- a/content/renderer/media/gpu/rtc_video_encoder_factory.cc
+++ b/content/renderer/media/gpu/rtc_video_encoder_factory.cc
@@ -5,6 +5,7 @@
 #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"
@@ -15,15 +16,6 @@
 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
@@ -38,8 +30,7 @@ void VEAToWebRTCCodecs(
   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));
     }
@@ -54,8 +45,7 @@ void VEAToWebRTCCodecs(
         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));
     }