ts-mux: repeat sps/pps on keyframes, should fix h264/ts streaming issues (hopefully)

[vlc] / modules / mux / mpeg / pes.c

diff --git a/modules/mux/mpeg/pes.c b/modules/mux/mpeg/pes.c
index 7df2891ee8570cedfd443c49e6c47c97a79357c9..d926af6564ecc4b3cdbacb29f54ebd40f251fdb6 100644 (file)
--- a/modules/mux/mpeg/pes.c
+++ b/modules/mux/mpeg/pes.c
@@ -35,7 +35,6 @@
 #include <vlc_block.h>
 #include <assert.h>
 
-#include <vlc_codecs.h>
 #include "pes.h"
 #include "bits.h"
 
@@ -319,6 +318,7 @@ int  EStoPES ( sout_instance_t *p_sout, block_t **pp_pes, block_t *p_es,
                    int b_mpeg2, int b_data_alignment, int i_header_size,
                    int i_max_pes_size )
 {
+    VLC_UNUSED(p_sout);
     block_t *p_pes;
     mtime_t i_pts, i_dts, i_length;
 
@@ -341,10 +341,12 @@ int  EStoPES ( sout_instance_t *p_sout, block_t **pp_pes, block_t *p_es,
         i_max_pes_size = PES_PAYLOAD_SIZE_MAX;
     }
 
-    if( p_fmt->i_codec == VLC_CODEC_MP4V &&
+    if( ( p_fmt->i_codec == VLC_CODEC_MP4V ||
+          p_fmt->i_codec == VLC_CODEC_H264 ) &&
         p_es->i_flags & BLOCK_FLAG_TYPE_I )
     {
-        /* For MPEG4 video, add VOL before I-frames */
+        /* For MPEG4 video, add VOL before I-frames,
+           for H264 add SPS/PPS before keyframes*/
         p_es = block_Realloc( p_es, p_fmt->i_extra, p_es->i_buffer );
 
         memcpy( p_es->p_buffer, p_fmt->p_extra, p_fmt->i_extra );