Android: enable H264&VP8 HW accelerator for MediaRecorder

content/browser/webrtc/webrtc_media_recorder_browsertest.cc

 // Copyright 2015 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 "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #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"
 
 namespace {
 
 static const char kMediaRecorderHtmlFile[] = "/media/mediarecorder_test.html";
 
 static struct EncodingParameters {
   bool disable_accelerator;
   std::string mime_type;
 } 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"},
     {false, "video/x-matroska;codecs=AVC1"},
 };
 
 }  // namespace
 
 namespace content {
 
@@ skipping 82 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, IllegalPauseThrowsDOMError) {
   MakeTypicalCall("testIllegalPauseThrowsDOMError();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, TwoChannelAudioRecording) {
   MakeTypicalCall("testTwoChannelAudio();", kMediaRecorderHtmlFile);
 }
 
 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) {
   MakeTypicalCall("testIllegalStopThrowsDOMError();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        IllegalStartWhileRecordingThrowsDOMError) {
   MakeTypicalCall("testIllegalStartInRecordingStateThrowsDOMError();",
                   kMediaRecorderHtmlFile);
@@ skipping 42 matching lines @@
                        RemovingTrackFromMediaStreamFiresErrorEvent) {
   MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();",
                   kMediaRecorderHtmlFile);
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         WebRtcMediaRecorderTest,
                         testing::ValuesIn(kEncodingParameters));
 
 }  // namespace content