Changeset 4598f227ca9f8cb35d6a834577db17aaef1a608d

Timestamp:

15/08/06 00:16:07 (2 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1155593767 +0000

git-parent:

[c72c4815bb525a54ecaae23a29e506e9af8b506c]

git-author:

Gildas Bazin <gbazin@videolan.org> 1155593767 +0000

Message:

* modules/packetizer/h264.c: insert an SPS and PPS before each keyframe.

Files:

• modules/packetizer/h264.c (modified) (7 diffs)

modules/packetizer/h264.c

@@ -285 +285 @@
-        {
-            case STATE_NOSYNC:
-l
+
-                if( block_FindStartcodeFromOffset( &p_sys->bytestream,
-                      &p_sys->i_offset, p_sys->startcode+1, 3 ) == VLC_SUCCESS)
@@ -355 +355 @@
- * PacketizeAVC1: Takes VCL blocks of data and creates annexe B type NAL stream
- * Will always use 4 byte 0 0 0 1 startcodes
-Should prepend the SPS and PPS to the front of the stream 
+Will prepend a SPS and PPS before each keyframe
- ****************************************************************************/
-static block_t *PacketizeAVC1( decoder_t *p_dec, block_t **pp_block )
@@ -368 +368 @@
-    p_block = *pp_block;
-    *pp_block = NULL;
-
-#if 0
-    if( //(p_block->i_flags & BLOCK_FLAG_TYPE_I) &&
-        p_sys->p_sps && p_sys->p_pps )
-    {
-        block_t *p_pic;
-        block_t *p_sps = block_Duplicate( p_sys->p_sps );
-        block_t *p_pps = block_Duplicate( p_sys->p_pps );
-        p_sps->i_dts = p_pps->i_dts = p_block->i_dts;
-        p_sps->i_pts = p_pps->i_pts = p_block->i_pts;
-        p_pic = ParseNALBlock( p_dec, p_sps );
-        if( p_pic ) block_ChainAppend( &p_ret, p_pic );
-        p_pic = ParseNALBlock( p_dec, p_pps );
-        if( p_pic ) block_ChainAppend( &p_ret, p_pic );
-    }
-#endif
-
-    for( p = p_block->p_buffer; p < &p_block->p_buffer[p_block->i_buffer]; )
@@ -491 +475 @@
-
-#define OUTPUT \
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    } while(0)
-
@@ -550 +546 @@
-                break;
-        }
+        p_frag->i_flags |= i_pic_flags;
-
-        /* pic_parameter_set_id */
@@ -710 +707 @@
-        free( dec );
-
-
-        if( p_sys->b_slice ) OUTPUT;
+
+        /* We have a new SPS */
+        if( p_sys->p_sps ) block_Release( p_sys->p_sps );
+        p_sys->p_sps = p_frag;
+
+        /* Do not append the SPS because we will insert it on keyframes */
+        return p_pic;
-    }
-    else if( i_nal_type == NAL_PPS )
@@ -724 +727 @@
-
-        if( p_sys->b_slice ) OUTPUT;
+
+        /* We have a new PPS */
+        if( p_sys->p_pps ) block_Release( p_sys->p_pps );
+        p_sys->p_pps = p_frag;
+
+        /* Do not append the PPS because we will insert it on keyframes */
+        return p_pic;
-    }
-    else if( i_nal_type == NAL_AU_DELIMITER ||