Changeset 7d1cff0bb27541abd0f34bd6fd1224c437d83632

Timestamp:

16/10/06 23:58:12 (2 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

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

git-parent:

[e7ad059e36db8fa273b6bc7a4f2abb25d4c8fe8f]

git-author:

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

Message:

Apparently ffmpeg doesn't like how we were feeding the SPS/PPS to it. At least this way it works. There is still something wrong. Instead of directly starting to work after the SPS/PPS is received (from MPEG-TS), it waits 1 extra I frame. If I just output the SPS/PPS directly instead of reinserting it, it works directly after the SPS/PPS is received on the I frame directly following them.

Files:

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

modules/packetizer/h264.c

@@ -8 +8 @@
- *          Eric Petit <titer@videolan.org>
- *          Gildas Bazin <gbazin@videolan.org>
+ *          Derk-Jan Hartman <hartman at videolan dot org>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -70 +71 @@
-    vlc_bool_t   b_sps;
-    vlc_bool_t   b_pps;
+    vlc_bool_t   b_header;
-
-    /* avcC data */
@@ -161 +163 @@
-    p_sys->p_sps   = 0;
-    p_sys->p_pps   = 0;
+    p_sys->b_header= VLC_FALSE;
-
-    p_sys->i_nal_type = -1;
@@ -221 +224 @@
-        memcpy( p_dec->fmt_out.p_extra, p_sys->p_sps->p_buffer, p_sys->p_sps->i_buffer);
-        memcpy( p_dec->fmt_out.p_extra+p_sys->p_sps->i_buffer, p_sys->p_pps->p_buffer, p_sys->p_pps->i_buffer);
+        p_sys->b_header = VLC_TRUE;
-
-        /* Set callback */
@@ -479 +483 @@
-#define OUTPUT \
-    do {                                                      \
+        if( !p_sys->b_header && p_sys->i_frame_type != BLOCK_FLAG_TYPE_I) \
+            break;                                            \
+                                                              \
-        p_pic = block_ChainGather( p_sys->p_frame );          \
-        p_pic->i_length = 0;    /* FIXME */                   \
@@ -497 +504 @@
-            block_ChainAppend( &p_sps, p_pic );               \
-            p_pic = block_ChainGather( p_sps );               \
+            p_sys->b_header = VLC_TRUE;                       \
-        }                                                     \
-    } while(0)