Changeset 50fd08c33f968d4050b63344a1765fa70ecf71ec

Timestamp:

09/14/05 00:01:20 (3 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

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

git-parent:

[4f9e5a30481b8a7babaeda8dbe46eea3323f3a1d]

git-author:

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

Message:

* modules/packetizer/h264.c: small fix to annexe-b packetizer.

Files:

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

modules/packetizer/h264.c

@@ -73 +73 @@
-    /* avcC data */
-    int i_avcC_length_size;
+    block_t *p_sps;
+    block_t *p_pps;
-
-    /* Useful values of the Sequence Parameter Set */
@@ -153 +155 @@
-    p_sys->b_sps   = VLC_FALSE;
-    p_sys->b_pps   = VLC_FALSE;
+    p_sys->p_sps   = 0;
+    p_sys->p_pps   = 0;
-
-    p_sys->i_nal_type = -1;
@@ -183 +187 @@
-            block_t *p_sps = nal_get_annexeb( p_dec, p + 2, i_length );
-
+            p_sys->p_sps = block_Duplicate( p_sps );
-            p_sps->i_pts = p_sps->i_dts = mdate();
-            ParseNALBlock( p_dec, p_sps );
@@ -194 +199 @@
-            block_t *p_pps = nal_get_annexeb( p_dec, p + 2, i_length );
-
+            p_sys->p_pps = block_Duplicate( p_pps );
-            p_pps->i_pts = p_pps->i_dts = mdate();
-            ParseNALBlock( p_dec, p_pps );
@@ -237 +243 @@
-    decoder_sys_t *p_sys = p_dec->p_sys;
-
+    if( p_sys->p_sps ) block_Release( p_sys->p_sps );
+    if( p_sys->p_pps ) block_Release( p_sys->p_pps );
-    block_BytestreamRelease( &p_sys->bytestream );
-    free( p_sys );
@@ -282 +290 @@
-                /* Find the next startcode */
-                if( block_FindStartcodeFromOffset( &p_sys->bytestream,
-
++1
-                {
-
-
-
-
-
-
-
+
+
-                }
-
@@ -301 +304 @@
-                                p_pic->i_buffer );
-
+                if( !p_pic->p_buffer[p_pic->i_buffer-1] ) p_pic->i_buffer--;
-                p_sys->i_offset = 0;
-
@@ -338 +342 @@
-    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]; )
@@ -535 +555 @@
-        p_sys->i_nal_type = i_nal_type;
-
-
-
+
-
-        p_sys->b_slice = VLC_TRUE;
@@ -549 +568 @@
-        int i_tmp;
-
-
-
+
-
-        p_sys->b_sps = VLC_TRUE;
@@ -650 +668 @@
-                }
-                if( h != 0 )
-
-VOUT_ASPECT_FACTOR * w / 
+ VOUT_ASPECT_FACTOR * w /
+
-                        p_dec->fmt_out.video.i_height;
-                else
@@ -661 +679 @@
-
-
-
-
+
-    }
-    else if( i_nal_type == NAL_PPS )
@@ -669 +686 @@
-        bs_init( &s, &p_frag->p_buffer[4], p_frag->i_buffer - 4 );
-
-
-
+
-        p_sys->b_pps = VLC_TRUE;
-
-        /* TODO */
-
-
-
+
-    }
-    else if( i_nal_type == NAL_AU_DELIMITER ||
@@ -682 +697 @@
-             ( i_nal_type >= 13 && i_nal_type <= 18 ) )
-    {
-
-
+
-    }
-