Changeset 5603 for pjproject/trunk/pjmedia/src/pjmedia-codec/h264_packetizer.c

Timestamp:

Jun 8, 2017 6:23:56 AM (7 years ago)

Author:

ming

Message:

Fixed #2022: Video Toolbox H264 encoder and decoder for Mac and iOS

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/h264_packetizer.c (modified) (8 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/h264_packetizer.c

@@ -95 +95 @@
     if (cfg &&
         cfg->mode != PJMEDIA_H264_PACKETIZER_MODE_NON_INTERLEAVED &&
-        cfg->mode != PJMEDIA_H264_PACKETIZER_MODE_SINGLE_NAL)
+        cfg->mode != PJMEDIA_H264_PACKETIZER_MODE_SINGLE_NAL &&
+        cfg->unpack_nal_start != 0 && cfg->unpack_nal_start != 3 &&
+        cfg->unpack_nal_start != 4)
     {
         return PJ_ENOTSUP;
@@ -103 +105 @@
     if (cfg) {
         pj_memcpy(&p_->cfg, cfg, sizeof(*cfg));
+        if (p_->cfg.unpack_nal_start == 0)
+            p_->cfg.unpack_nal_start = 3;
     } else {
         p_->cfg.mode = PJMEDIA_H264_PACKETIZER_MODE_NON_INTERLEAVED;
         p_->cfg.mtu = PJMEDIA_MAX_VID_PAYLOAD_SIZE;
+        p_->cfg.unpack_nal_start = 3;
     }
 
@@ -348 +353 @@
                                              unsigned   *bits_pos)
 {
-    const pj_uint8_t nal_start_code[3] = {0, 0, 1};
+    const pj_uint8_t nal_start[4] = {0, 0, 0, 1};
+    const pj_uint8_t *nal_start_code; 
     enum { MIN_PAYLOAD_SIZE = 2 };
     pj_uint8_t nal_type;
 
-    PJ_UNUSED_ARG(pktz);
+    nal_start_code = nal_start + PJ_ARRAY_SIZE(nal_start) -
+                     pktz->cfg.unpack_nal_start;
 
 #if DBG_UNPACKETIZE
@@ -385 +392 @@
 
         /* Validate bitstream length */
-        if (bits_len-*bits_pos < payload_len+PJ_ARRAY_SIZE(nal_start_code)) {
+        if (bits_len-*bits_pos < payload_len+pktz->cfg.unpack_nal_start) {
             /* Insufficient bistream buffer, discard this payload */
-            pj_assert(!"Insufficient H.263 bitstream buffer");
+            pj_assert(!"Insufficient H.264 bitstream buffer");
             return PJ_ETOOSMALL;
         }
 
         /* Write NAL unit start code */
-        pj_memcpy(p, &nal_start_code, PJ_ARRAY_SIZE(nal_start_code));
-        p += PJ_ARRAY_SIZE(nal_start_code);
+        pj_memcpy(p, nal_start_code, pktz->cfg.unpack_nal_start);
+        p += pktz->cfg.unpack_nal_start;
 
         /* Write NAL unit */
@@ -420 +427 @@
         if (bits_len - *bits_pos < payload_len + 32) {
             /* Insufficient bistream buffer, discard this payload */
-            pj_assert(!"Insufficient H.263 bitstream buffer");
+            pj_assert(!"Insufficient H.264 bitstream buffer");
             return PJ_ETOOSMALL;
         }
@@ -433 +440 @@
 
             /* Write NAL unit start code */
-            pj_memcpy(p, &nal_start_code, PJ_ARRAY_SIZE(nal_start_code));
-            p += PJ_ARRAY_SIZE(nal_start_code);
+            pj_memcpy(p, nal_start_code, pktz->cfg.unpack_nal_start);
+            p += pktz->cfg.unpack_nal_start;
 
             /* Get NAL unit size */
@@ -471 +478 @@
 
         /* Validate bitstream length */
-        if (bits_len-*bits_pos < payload_len+PJ_ARRAY_SIZE(nal_start_code)) {
+        if (bits_len-*bits_pos < payload_len+pktz->cfg.unpack_nal_start) {
             /* Insufficient bistream buffer, drop this packet */
-            pj_assert(!"Insufficient H.263 bitstream buffer");
+            pj_assert(!"Insufficient H.264 bitstream buffer");
             pktz->unpack_prev_lost = PJ_TRUE;
             return PJ_ETOOSMALL;
@@ -487 +494 @@
         if (S) {
             /* This is the first part, write NAL unit start code */
-            pj_memcpy(p, &nal_start_code, PJ_ARRAY_SIZE(nal_start_code));
-            p += PJ_ARRAY_SIZE(nal_start_code);
+            pj_memcpy(p, nal_start_code, pktz->cfg.unpack_nal_start);
+            p += pktz->cfg.unpack_nal_start;
 
             /* Write NAL unit octet */