Renable hevc support for android (#80)

Author: taste1981

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

@@ -13,6 +13,7 @@
 import static org.webrtc.MediaCodecUtils.EXYNOS_PREFIX;
 import static org.webrtc.MediaCodecUtils.INTEL_PREFIX;
 import static org.webrtc.MediaCodecUtils.QCOM_PREFIX;
+import static org.webrtc.MediaCodecUtils.HISI_PREFIX;
 
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
@@ -213,6 +214,8 @@ private boolean isHardwareSupportedInCurrentSdkVp8(MediaCodecInfo info) {
     String name = info.getName();
     // QCOM Vp8 encoder is supported in KITKAT or later.
     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)
         // 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.
@@ -222,7 +225,7 @@ private boolean isHardwareSupportedInCurrentSdkVp8(MediaCodecInfo info) {
 
   private boolean isHardwareSupportedInCurrentSdkVp9(MediaCodecInfo info) {
     String name = info.getName();
-    return (name.startsWith(QCOM_PREFIX) || name.startsWith(EXYNOS_PREFIX))
+    return (name.startsWith(QCOM_PREFIX) || name.startsWith(EXYNOS_PREFIX) || name.startsWith(HISI_PREFIX))
         // Both QCOM and Exynos VP9 encoders are supported in N or later.
         && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
   }
@@ -246,7 +249,9 @@ private boolean isHardwareSupportedInCurrentSdkH265(MediaCodecInfo info) {
     return (name.startsWith(QCOM_PREFIX) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
            // Exynos H265 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)
+           // Hisi VP8 encoder seems to be supported. Needs more testing.
+           || (name.startsWith(HISI_PREFIX) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT);
   }
 
   private boolean isMediaCodecAllowed(MediaCodecInfo info) {

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

@@ -28,6 +28,7 @@ class MediaCodecUtils {
   static final String INTEL_PREFIX = "OMX.Intel.";
   static final String NVIDIA_PREFIX = "OMX.Nvidia.";
   static final String QCOM_PREFIX = "OMX.qcom.";
+  static final String HISI_PREFIX = "OMX.hisi.";
   static final String[] SOFTWARE_IMPLEMENTATION_PREFIXES = {"OMX.google.", "OMX.SEC."};
 
   // NV12 color format supported by QCOM codec, but not declared in MediaCodec -

sdk/android/src/jni/video_encoder_wrapper.cc

@@ -13,6 +13,9 @@
 #include <utility>
 
 #include "common_video/h264/h264_common.h"
+#ifndef DISABLE_H265
+#include "common_video/h265/h265_common.h"
+#endif
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "modules/video_coding/utility/vp8_header_parser.h"
@@ -322,19 +325,8 @@ int32_t VideoEncoderWrapper::HandleReturnCode(JNIEnv* jni,
 RTPFragmentationHeader VideoEncoderWrapper::ParseFragmentationHeader(
     rtc::ArrayView<const uint8_t> buffer) {
   RTPFragmentationHeader header;
-#ifndef DISABLE_H265
-  if (codec_settings_.codecType == kVideoCodecH264
-    || codec_settings_.codecType == kVideoCodecH265) {
-    if (codec_settings_.codecType == kVideoCodecH264) {
-      h264_bitstream_parser_.ParseBitstream(buffer.data(), buffer.size());
-    } else if (codec_settings_.codecType == kVideoCodecH265) {
-      h265_bitstream_parser_.ParseBitstream(buffer.data(), buffer.size());
-    }
-#else
   if (codec_settings_.codecType == kVideoCodecH264) {
-    h264_bitstream_parser_.ParseBitstream(buffer.data(), buffer.size());
-#endif
-
+      h264_bitstream_parser_.ParseBitstream(buffer.data(), buffer.size());
     // For H.264 search for start codes.
     const std::vector<H264::NaluIndex> nalu_idxs =
         H264::FindNaluIndices(buffer.data(), buffer.size());
@@ -349,7 +341,27 @@ RTPFragmentationHeader VideoEncoderWrapper::ParseFragmentationHeader(
       header.fragmentationOffset[i] = nalu_idxs[i].payload_start_offset;
       header.fragmentationLength[i] = nalu_idxs[i].payload_size;
     }
-  } else {
+  }
+#ifndef DISABLE_H265
+  else if (codec_settings_.codecType == kVideoCodecH265) {
+    h265_bitstream_parser_.ParseBitstream(buffer.data(), buffer.size());
+    // For H.265 search for start codes.
+    const std::vector<H265::NaluIndex> nalu_idxs =
+        H265::FindNaluIndices(buffer.data(), buffer.size());
+    if (nalu_idxs.empty()) {
+      RTC_LOG(LS_ERROR) << "Start code is not found!";
+      RTC_LOG(LS_ERROR) << "Data:" << buffer[0] << " " << buffer[1] << " "
+                        << buffer[2] << " " << buffer[3] << " " << buffer[4]
+                        << " " << buffer[5];
+    }
+    header.VerifyAndAllocateFragmentationHeader(nalu_idxs.size());
+    for (size_t i = 0; i < nalu_idxs.size(); i++) {
+      header.fragmentationOffset[i] = nalu_idxs[i].payload_start_offset;
+      header.fragmentationLength[i] = nalu_idxs[i].payload_size;
+    }
+  }
+#endif
+  else {
     // Generate a header describing a single fragment.
     header.VerifyAndAllocateFragmentationHeader(1);
     header.fragmentationOffset[0] = 0;