Add extra config for white list codec. (#107)

Author: zhangyihui1

sdk/android/BUILD.gn

@@ -394,6 +394,7 @@ if (is_android) {
   rtc_android_library("hwcodecs_java") {
     visibility = [ "*" ]
     sources = [
+      "api/org/webrtc/VideoCapabilityParser.java",
       "api/org/webrtc/HardwareVideoDecoderFactory.java",
       "api/org/webrtc/HardwareVideoEncoderFactory.java",
       "api/org/webrtc/PlatformSoftwareVideoDecoderFactory.java",

sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java

@@ -14,6 +14,7 @@
 import static org.webrtc.MediaCodecUtils.INTEL_PREFIX;
 import static org.webrtc.MediaCodecUtils.QCOM_PREFIX;
 import static org.webrtc.MediaCodecUtils.HISI_PREFIX;
+import static org.webrtc.MediaCodecUtils.IMG_PREFIX;
 
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
@@ -42,6 +43,9 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
   @Nullable private final EglBase14.Context sharedContext;
   private final boolean enableIntelVp8Encoder;
   private final boolean enableH264HighProfile;
+  private final String  extraMediaCodecFile = "sdcard/mediaCodec.xml";
+  private final VideoCapabilityParser vcp = new VideoCapabilityParser();
+
   @Nullable private final Predicate<MediaCodecInfo> codecAllowedPredicate;
 
   /**
@@ -216,16 +220,20 @@ private boolean isHardwareSupportedInCurrentSdkVp8(MediaCodecInfo info) {
     return (name.startsWith(QCOM_PREFIX) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
         // Hisi VP8 encoder seems to be supported. Needs more testing.
         || (name.startsWith(HISI_PREFIX) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+        || (name.startsWith(IMG_PREFIX) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
         // Exynos VP8 encoder is supported in M or later.
         || (name.startsWith(EXYNOS_PREFIX) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
         // Intel Vp8 encoder is supported in LOLLIPOP or later, with the intel encoder enabled.
         || (name.startsWith(INTEL_PREFIX) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
-               && enableIntelVp8Encoder);
+               && enableIntelVp8Encoder)
+        || vcp.isExtraHardwareSupported(name, "video/x-vnd.on2.vp8", vcp.parseWithTag(vcp.loadWithDom(extraMediaCodecFile), "Decoders"));
   }
 
   private boolean isHardwareSupportedInCurrentSdkVp9(MediaCodecInfo info) {
     String name = info.getName();
-    return (name.startsWith(QCOM_PREFIX) || name.startsWith(EXYNOS_PREFIX) || name.startsWith(HISI_PREFIX))
+    return (name.startsWith(QCOM_PREFIX) || name.startsWith(EXYNOS_PREFIX) || name.startsWith(HISI_PREFIX)
+        || name.startsWith(IMG_PREFIX)
+        || vcp.isExtraHardwareSupported(name, "video/x-vnd.on2.vp9", vcp.parseWithTag(vcp.loadWithDom(extraMediaCodecFile), "Decoders")))
         // Both QCOM and Exynos VP9 encoders are supported in N or later.
         && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
   }
@@ -240,7 +248,10 @@ private boolean isHardwareSupportedInCurrentSdkH264(MediaCodecInfo info) {
     return (name.startsWith(QCOM_PREFIX) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
         // Exynos H264 encoder is supported in LOLLIPOP or later.
         || (name.startsWith(EXYNOS_PREFIX)
-               && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP);
+               && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+        || (name.startsWith(HISI_PREFIX) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+        || (name.startsWith(IMG_PREFIX) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+        || vcp.isExtraHardwareSupported(name, "video/avc", vcp.parseWithTag(vcp.loadWithDom(extraMediaCodecFile), "Decoders"));;
   }
 
   private boolean isHardwareSupportedInCurrentSdkH265(MediaCodecInfo info) {
@@ -251,7 +262,9 @@ private boolean isHardwareSupportedInCurrentSdkH265(MediaCodecInfo info) {
            || (name.startsWith(EXYNOS_PREFIX)
                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
            // Hisi VP8 encoder seems to be supported. Needs more testing.
-           || (name.startsWith(HISI_PREFIX) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT);
+           || (name.startsWith(HISI_PREFIX) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+           || (name.startsWith(IMG_PREFIX) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+           || vcp.isExtraHardwareSupported(name, "video/hevc", vcp.parseWithTag(vcp.loadWithDom(extraMediaCodecFile), "Decoders"));
   }
 
   private boolean isMediaCodecAllowed(MediaCodecInfo info) {

sdk/android/api/org/webrtc/VideoCapabilityParser.java

@@ -0,0 +1,84 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+package org.webrtc;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.webrtc.Logging;
+import org.xml.sax.SAXException;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+public class VideoCapabilityParser {
+
+  public Document loadWithDom(String xmlFilePath) {
+    Document document = null;
+    File file = new File(xmlFilePath);
+    if (file.exists()) {
+      try {
+        InputStream inputStream = new FileInputStream(file);
+        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
+        document = documentBuilder.parse(inputStream);
+      } catch (FileNotFoundException e) {
+      } catch (ParserConfigurationException e) {
+      } catch (IOException e) {
+      } catch (SAXException e) {
+      }
+    }
+    return document;
+  }
+
+  public ArrayList<HashMap<String, String>> parseWithTag(Document document, String tag) {
+    if (document == null) {
+      return null;
+    }
+    ArrayList<HashMap<String, String>> extraMediaCodecList = new ArrayList<>();
+    NodeList sList = document.getElementsByTagName(tag);
+    for (int i = 0; i < sList.getLength(); i++) {
+      Element encoded = (Element) sList.item(i);
+      NodeList nodeList = encoded.getElementsByTagName("MediaCodec");
+      for (i = 0; i < nodeList.getLength(); i++) {
+        HashMap<String, String> map = new HashMap<>();
+        Node node = nodeList.item(i);
+        map.put("name", node.getAttributes().getNamedItem("name").getNodeValue());
+        map.put("type", node.getAttributes().getNamedItem("type").getNodeValue());
+        extraMediaCodecList.add(map);
+      }
+    }
+    return extraMediaCodecList;
+  }
+
+  public boolean isExtraHardwareSupported(String name , String type, ArrayList<HashMap<String, String>> extraMediaCodecMap){
+    boolean result = false;
+    if (extraMediaCodecMap != null) {
+      for (HashMap<String, String> item : extraMediaCodecMap){
+        if (name.startsWith(item.get("name")) && type.startsWith(item.get("type"))){
+          result=true;
+          break;
+        }
+      }
+    }
+    return result;
+  }
+}

sdk/android/src/java/org/webrtc/MediaCodecUtils.java

@@ -32,6 +32,7 @@ class MediaCodecUtils {
   static final String[] SOFTWARE_IMPLEMENTATION_PREFIXES = {
       "OMX.google.", "OMX.SEC.", "c2.android"};
   static final String HISI_PREFIX = "OMX.hisi.";
+  static final String IMG_PREFIX = "OMX.IMG.";
 
   // NV12 color format supported by QCOM codec, but not declared in MediaCodec -
   // see /hardware/qcom/media/mm-core/inc/OMX_QCOMExtns.h