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"
@@ skipping 35 matching lines @@
 
     AppendUseFakeUIForMediaStreamFlag();
 
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kUseFakeDeviceForMediaStream);
 
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kEnableBlinkFeatures, "GetUserMedia");
   }
 
-  void MaybeForceDisableEncodeAccelerator(bool disable) {
+  void MaybeForceDisableEncodeAccelerator(bool disable, std::string mime_type) {
     if (!disable)
       return;
+
+    bool disable_flag = true;
+#if defined(OS_ANDROID)
+    // There is no SW H264 on Android.

[emircan, 2017/04/07 17:33:04]

// OpenH264 encoder is not supported on Android.

[braveyao, 2017/04/08 00:56:26]

Done.

+    if (mime_type.find("AVC1"))
+      disable_flag = false;
+#endif
+
     // This flag is also used for encoding, https://crbug.com/616640.
-    base::CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kDisableAcceleratedVideoDecode);
+    if (disable_flag)

[emircan, 2017/04/07 17:33:04]

How was this test running and passing on android before?

This method would result in running the same test case twice by ignoring the
|disable_accelerator| param. Why about removing l.25 "if !defined(OS_ANDROID)"
instead?

[braveyao, 2017/04/08 00:56:26]

Done.

+      base::CommandLine::ForCurrentProcess()->AppendSwitch(
+          switches::kDisableAcceleratedVideoDecode);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebRtcMediaRecorderTest);
 };
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, Start) {
   MakeTypicalCall("testStartAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, StartAndStop) {
   MakeTypicalCall("testStartStopAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, StartAndDataAvailable) {
-  MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
+  MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator,
+                                     GetParam().mime_type);
   MakeTypicalCall(base::StringPrintf("testStartAndDataAvailable(\"%s\");",
                                      GetParam().mime_type.c_str()),
                   kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, StartWithTimeSlice) {
-  MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
+  MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator,
+                                     GetParam().mime_type);
   MakeTypicalCall(base::StringPrintf("testStartWithTimeSlice(\"%s\");",
                                      GetParam().mime_type.c_str()),
                   kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, Resume) {
   MakeTypicalCall("testResumeAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, NoResumeWhenRecorderInactive) {
   MakeTypicalCall("testIllegalResumeThrowsDOMError();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, ResumeAndDataAvailable) {
-  MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
+  MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator,
+                                     GetParam().mime_type);
   MakeTypicalCall(base::StringPrintf("testResumeAndDataAvailable(\"%s\");",
                                      GetParam().mime_type.c_str()),
                   kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, Pause) {
   MakeTypicalCall("testPauseAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, PauseStop) {
   MakeTypicalCall("testPauseStopAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        PausePreventsDataavailableFromBeingFired) {
   MakeTypicalCall("testPausePreventsDataavailableFromBeingFired();",
                   kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, IllegalPauseThrowsDOMError) {
   MakeTypicalCall("testIllegalPauseThrowsDOMError();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, TwoChannelAudioRecording) {
   MakeTypicalCall("testTwoChannelAudio();", kMediaRecorderHtmlFile);
 }
+#if defined(OS_ANDROID)
+// Basically HW codec is preferred on Android, which doesn't support alpha
+// channel. And this test doesn't work on some old platforms.

[emircan, 2017/04/07 17:33:04]

This test only inputs alpha channel video for recording. For Android VEA case,
alpha channel would be dropped and rest would be recorded, see the line below.
We know that only VPX software encoder returns true for CanEncodeAlphaChannel().
I don't see any reason why this tests should be disabled. 

https://cs.chromium.org/chromium/src/content/renderer/media_recorder/video_tr...

[braveyao, 2017/04/08 00:56:26]

Emmm you are right. The failure of this case on N5 is due to the request video
format. It seems that the minimum supported video format for H264 is different
on older platforms(e.g. same case works on N5X but fail on N5). Unfortunately I
didn't find any doc for it yet. I'll take deep look later, since this may affect
RTC call too and deserve another cl.

[braveyao, 2017/04/14 22:28:28]

Done.

+#define MAYBE_RecordWithTransparency DISABLED_RecordWithTransparency
+#else
+#define MAYBE_RecordWithTransparency RecordWithTransparency
+#endif
 
-IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, RecordWithTransparency) {
-  MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
+IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, MAYBE_RecordWithTransparency) {
+  MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator,
+                                     GetParam().mime_type);
   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,
@@ skipping 22 matching lines @@
 // Flaky on Linux TSan, https://crbug.com/694373.
 #define MAYBE_PeerConnection DISABLED_PeerConnection
 #elif defined(OS_WIN) && !defined(NDEBUG)
 // Fails on Win7 debug, https://crbug.com/703844.
 #define MAYBE_PeerConnection DISABLED_PeerConnection
 #else
 #define MAYBE_PeerConnection PeerConnection
 #endif
 
 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, MAYBE_PeerConnection) {
-  MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
+  MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator,
+                                     GetParam().mime_type);
   MakeTypicalCall(base::StringPrintf("testRecordRemotePeerConnection(\"%s\");",
                                      GetParam().mime_type.c_str()),
                   kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        AddingTrackToMediaStreamFiresErrorEvent) {
   MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();",
                   kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        RemovingTrackFromMediaStreamFiresErrorEvent) {
   MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();",
                   kMediaRecorderHtmlFile);
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         WebRtcMediaRecorderTest,
                         testing::ValuesIn(kEncodingParameters));
 
 }  // namespace content