Changeset 06438cff3f2947f729362fe3bcea29551721a48c

Timestamp:

06/04/05 11:31:38 (4 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1112779898 +0000

git-parent:

[53a27d3eb660248ff99e968aed7f9d6854aacbe0]

git-author:

Laurent Aimar <fenrir@videolan.org> 1112779898 +0000

Message:

• h264: bug fix (give valid date + split at the right place).
  

Files:

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

modules/packetizer/h264.c

@@ -68 +68 @@
-    block_t    *p_frame;
-
-    int64_t      i_dts;
-    int64_t      i_pts;
-    unsigned int i_flags;
-
-    vlc_bool_t   b_sps;
-
@@ -104 +100 @@
-    NAL_SEI         = 6,    /* ref_idc == 0 */
-    NAL_SPS         = 7,
-
+
+
-    /* ref_idc == 0 for 6,9,10,11,12 */
-};
@@ -153 +150 @@
-    p_sys->b_slice = VLC_FALSE;
-    p_sys->p_frame = NULL;
-    p_sys->i_dts   = 0;
-    p_sys->i_pts   = 0;
-    p_sys->i_flags = 0;
-    p_sys->b_sps   = VLC_FALSE;
-
@@ -295 +289 @@
-                    break;
-                }
+#if 0
+                msg_Dbg( p_dec, "pts="I64Fd" dts="I64Fd,
+                         p_pic->i_pts, p_pic->i_dts );
+#endif
-
-                /* So p_block doesn't get re-added several times */
@@ -419 +417 @@
-    const int i_nal_ref_idc = (p_frag->p_buffer[3] >> 5)&0x03;
-    const int i_nal_type = p_frag->p_buffer[3]&0x1f;
+
+#define OUTPUT \
+    do {                                                \
+        p_pic = block_ChainGather( p_sys->p_frame );    \
+        p_pic->i_length = 0;    /* FIXME */             \
+                                                        \
+        p_sys->p_frame = NULL;                          \
+        p_sys->b_slice = VLC_FALSE;                     \
+    } while(0)
+
-
-    if( p_sys->b_slice && !p_sys->b_sps )
@@ -508 +516 @@
-
-        if( b_pic && p_sys->b_slice )
-
-
-
-
-
-
-
-
-
-
-
+
-
-        p_sys->b_slice = VLC_TRUE;
-        p_sys->i_flags = i_pic_flags;
-        p_sys->i_dts   = p_frag->i_dts;
-        p_sys->i_pts   = p_frag->i_pts;
-
-        free( dec );
@@ -640 +635 @@
-
-        free( dec );
+
+
+        if( p_sys->b_slice )
+            OUTPUT;
-    }
-    else if( i_nal_type == NAL_PPS )
@@ -648 +647 @@
-        /* TODO */
-        msg_Dbg( p_dec, "found NAL_PPS" );
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* Append the block */