Android: enable H264&VP8 HW accelerator for MediaRecorder

content/browser/webrtc/webrtc_media_recorder_browsertest.cc

Index: content/browser/webrtc/webrtc_media_recorder_browsertest.cc
diff --git a/content/browser/webrtc/webrtc_media_recorder_browsertest.cc b/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
index 7d945a9a38b9c9afa42bc7ad70a74a4017c0b505..b67b2716b53429daf75a4b8b23b33eaf6a144900 100644
--- a/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
+++ b/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
@@ -8,6 +8,7 @@
 #include "build/build_config.h"
 #include "content/browser/webrtc/webrtc_content_browsertest_base.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/features.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "media/base/media_switches.h"
@@ -22,7 +23,9 @@ static struct EncodingParameters {
 } const kEncodingParameters[] = {
     {true, "video/webm;codecs=VP8"},
     {true, "video/webm;codecs=VP9"},
+#if BUILDFLAG(RTC_USE_H264)
     {true, "video/x-matroska;codecs=AVC1"},
+#endif
     {false, ""},  // Instructs the platform to choose any accelerated codec.
     {false, "video/webm;codecs=VP8"},
     {false, "video/webm;codecs=VP9"},
@@ -125,10 +128,13 @@ IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, TwoChannelAudioRecording) {
 }
 
 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, RecordWithTransparency) {
-  MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
-  MakeTypicalCall(base::StringPrintf("testRecordWithTransparency(\"%s\");",
-                                     GetParam().mime_type.c_str()),
-                  kMediaRecorderHtmlFile);
+  // Alpha channel is only supported in "video/webm;codecs={vp8/vp9}" cases.
+  if (GetParam().mime_type.find("video/webm") != std::string::npos) {

[mcasas, 2017/04/20 22:39:47]

if (GetParam().mime_type.find("video/webm") == std::string::npos)
  return;

// The rest.

+    MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
+    MakeTypicalCall(base::StringPrintf("testRecordWithTransparency(\"%s\");",
+                                       GetParam().mime_type.c_str()),
+                                       kMediaRecorderHtmlFile);
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, IllegalStopThrowsDOMError) {