Changeset 94431db895039165b839c35907eb21890b87cc61

Timestamp:

08/14/06 23:44:15 (2 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1155591855 +0000

git-parent:

[7cb0b7cc0d65a44147aa14fd7d7ab11936114ba0]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1155591855 +0000

Message:

* Victory at last. The h264 packetizer is fixed. Thx to Haali and gibalou for the insights.

• manage private data properly
  
• use 4 byte startcodes
  

Files:

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

modules/packetizer/h264.c

@@ -122 +122 @@
-/*****************************************************************************
- * Open: probe the packetizer and return score
+ * When opening after demux, the packetizer is only loaded AFTER the decoder
+ * That means that what you set in fmt_out is ignored by the decoder in this special case
- *****************************************************************************/
-static int Open( vlc_object_t *p_this )
@@ -166 +168 @@
-    es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
-    p_dec->fmt_out.i_codec = VLC_FOURCC( 'h', '2', '6', '4' );
-    /* FIXME: FFMPEG isn't happy at all if you leave this */
-    if( p_dec->fmt_out.i_extra ) free( p_dec->fmt_out.p_extra );
-    p_dec->fmt_out.i_extra = 0; p_dec->fmt_out.p_extra = 0;
-
-    if( p_dec->fmt_in.i_codec == VLC_FOURCC( 'a', 'v', 'c', '1' ) )
-    {
+        /* This type of stream is produced by mp4 and matroska
+         * when we want to store it in another streamformat, you need to convert
+         * The fmt_in.p_extra should ALWAYS contain the avcC
+         * The fmt_out.p_extra should contain all the SPS and PPS with 4 byte startcodes */
-        uint8_t *p = &((uint8_t*)p_dec->fmt_in.p_extra)[4];
-        int i_sps, i_pps;
@@ -181 +184 @@
-        /* Read SPS */
-        i_sps = (*p++)&0x1f;
-
-        for( i = 0; i < i_sps; i++ )
-        {
@@ -207 +209 @@
-                 p_sys->i_avcC_length_size, i_sps, i_pps );
-
+        /* FIXME: FFMPEG isn't happy at all if you leave this */
+        if( p_dec->fmt_out.i_extra ) free( p_dec->fmt_out.p_extra );
+        p_dec->fmt_out.i_extra = 0; p_dec->fmt_out.p_extra = NULL;
+        
+        /* Set the new extradata */
+        p_dec->fmt_out.i_extra = p_sys->p_pps->i_buffer + p_sys->p_sps->i_buffer;
+        p_dec->fmt_out.p_extra = (uint8_t*)malloc( p_dec->fmt_out.i_extra );
+        memcpy( p_dec->fmt_out.p_extra, p_sys->p_pps->p_buffer, p_sys->p_pps->i_buffer);
+        memcpy( p_dec->fmt_out.p_extra+p_sys->p_pps->i_buffer, p_sys->p_sps->p_buffer, p_sys->p_sps->i_buffer);
+
-        /* Set callback */
-        p_dec->pf_packetize = PacketizeAVC1;
@@ -212 +224 @@
-    else
-    {
+        /* This type of stream contains data with 3 of 4 byte startcodes 
+         * The fmt_in.p_extra MAY contain SPS/PPS with 4 byte startcodes
+         * The fmt_out.p_extra should be the same */
+         
-        /* Set callback */
-        p_dec->pf_packetize = Packetize;
@@ -252 +268 @@
-/****************************************************************************
- * Packetize: the whole thing
+ * Search for the startcodes 3 or more bytes
+ * Feed ParseNALBlock ALWAYS with 4 byte startcode prepended NALs
- ****************************************************************************/
-static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
@@ -267 +285 @@
-        {
-            case STATE_NOSYNC:
+                /* Skip untill 3 byte startcode 0 0 1 */
-                if( block_FindStartcodeFromOffset( &p_sys->bytestream,
-                      &p_sys->i_offset, p_sys->startcode+1, 3 ) == VLC_SUCCESS)
@@ -275 +294 @@
-                if( p_sys->i_offset )
-                {
+                    /* skip the data */
-                    block_SkipBytes( &p_sys->bytestream, p_sys->i_offset );
-                    p_sys->i_offset = 0;
@@ -289 +309 @@
-
-            case STATE_NEXT_SYNC:
-startcode 
+3 byte startcode 0 0 1
-                if( block_FindStartcodeFromOffset( &p_sys->bytestream,
-                      &p_sys->i_offset, p_sys->startcode+1, 3 ) != VLC_SUCCESS)
@@ -298 +318 @@
-
-                /* Get the new fragment and set the pts/dts */
-
++1 
-                p_pic->i_pts = p_sys->bytestream.p_block->i_pts;
-                p_pic->i_dts = p_sys->bytestream.p_block->i_dts;
-
-
-
-
-
+
+
+
+
+
+
+
+
-                p_sys->i_offset = 0;
-
@@ -330 +353 @@
-
-/****************************************************************************
-
+
+
+
- ****************************************************************************/
-static block_t *PacketizeAVC1( decoder_t *p_dec, block_t **pp_block )
@@ -395 +420 @@
-    block_t *p_nal;
-
-3
+4
-
-    /* Add start code */
-    p_nal->p_buffer[0] = 0x00;
-    p_nal->p_buffer[1] = 0x00;
-
+
+
-
-    /* Copy nalu */
-3
+4
-
-    return p_nal;
@@ -452 +478 @@
-
-
+/*****************************************************************************
+ * ParseNALBlock: parses annexB type NALs
+ * All p_frag blocks are required to start with 0 0 0 1 4-byte startcode 
+ *****************************************************************************/
-static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag )
-{
@@ -457 +487 @@
-    block_t *p_pic = NULL;
-
-3
-3
+4
+4
-
-#define OUTPUT \
@@ -494 +524 @@
-
-        /* do not convert the whole frame */
-4
-4
+5
+5
-        bs_init( &s, dec, i_dec );
-
@@ -574 +604 @@
-        p_sys->b_sps = VLC_TRUE;
-
-4
-4
+5
+5
-
-        bs_init( &s, dec, i_dec );
@@ -686 +716 @@
-    {
-        bs_t s;
-4], p_frag->i_buffer - 4
+5], p_frag->i_buffer - 5
-
-        if( !p_sys->b_pps ) msg_Dbg( p_dec, "found NAL_PPS" );