Merge pull request ypresto#29 from spiritedRunning/pull_request

ypresto · web-flow · commit 8bbf3ba22ae4 · 2016-08-18T17:41:18.000+09:00
Process specified device sps nal data
diff --git a/lib/src/main/java/net/ypresto/androidtranscoder/utils/AvcCsdUtils.java b/lib/src/main/java/net/ypresto/androidtranscoder/utils/AvcCsdUtils.java
@@ -29,6 +29,9 @@ public class AvcCsdUtils {
     private static final byte[] AVC_START_CODE_4 = {0x00, 0x00, 0x00, 0x01};
     // Refer: http://www.cardinalpeak.com/blog/the-h-264-sequence-parameter-set/
     private static final byte AVC_SPS_NAL = 103; // 0<<7 + 3<<5 + 7<<0
+    // https://tools.ietf.org/html/rfc6184
+    private static final byte AVC_SPS_NAL_2 = 39; // 0<<7 + 1<<5 + 7<<0
+    private static final byte AVC_SPS_NAL_3 = 71; // 0<<7 + 2<<5 + 7<<0
 
     /**
      * @return ByteBuffer contains SPS without NAL header.
@@ -40,9 +43,12 @@ public static ByteBuffer getSpsBuffer(MediaFormat format) {
         prefixedSpsBuffer.flip();
 
         skipStartCode(prefixedSpsBuffer);
-        if (prefixedSpsBuffer.get() != AVC_SPS_NAL) {
+
+        byte spsNalData = prefixedSpsBuffer.get();
+        if (spsNalData != AVC_SPS_NAL && spsNalData != AVC_SPS_NAL_2 && spsNalData != AVC_SPS_NAL_3) {
             throw new IllegalStateException("Got non SPS NAL data.");
         }
+
         return prefixedSpsBuffer.slice();
     }
 
