[vlc-commits] mux: mp4: fix recording of rtsp

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Aug 28 17:14:56 2017 +0200| [58f1176fb2d2c7a1b11500c35f3209d75d3cf7d7] | committer: Francois Cartegnie

mux: mp4: fix recording of rtsp

no dts is available for those streams.
better record with wrong timestamps than
totally broken sample tables.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=58f1176fb2d2c7a1b11500c35f3209d75d3cf7d7
---

 modules/mux/mp4/mp4.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/mux/mp4/mp4.c b/modules/mux/mp4/mp4.c
index fd8d144f11..5d13964b87 100644
--- a/modules/mux/mp4/mp4.c
+++ b/modules/mux/mp4/mp4.c
@@ -578,6 +578,11 @@ static block_t * BlockDequeue(sout_input_t *p_input, mp4_stream_t *p_stream)
     return p_block;
 }
 
+static inline mtime_t dts_fb_pts( const block_t *p_data )
+{
+    return p_data->i_dts > VLC_TS_INVALID ? p_data->i_dts: p_data->i_pts;
+}
+
 static int Mux(sout_mux_t *p_mux)
 {
     sout_mux_sys_t *p_sys = p_mux->p_sys;
@@ -619,9 +624,9 @@ static int Mux(sout_mux_t *p_mux)
         /* Set current segment ranges */
         if( p_stream->i_first_dts == VLC_TS_INVALID )
         {
-            p_stream->i_first_dts = p_data->i_dts;
+            p_stream->i_first_dts = dts_fb_pts( p_data );
             if( p_sys->i_start_dts == VLC_TS_INVALID )
-                p_sys->i_start_dts = p_data->i_dts;
+                p_sys->i_start_dts = p_stream->i_first_dts;
         }
 
         if (p_stream->mux.fmt.i_cat != SPU_ES) {
@@ -658,7 +663,7 @@ static int Mux(sout_mux_t *p_mux)
                 }
                 else
                 {
-                    int64_t i_diff  = p_next->i_dts - p_data->i_dts;
+                    int64_t i_diff  = dts_fb_pts( p_next ) - dts_fb_pts( p_data );
                     if (i_diff < CLOCK_FREQ) /* protection */
                         p_data->i_length = i_diff;
                 }
@@ -678,7 +683,7 @@ static int Mux(sout_mux_t *p_mux)
         if (p_stream->mux.fmt.i_cat == SPU_ES && p_stream->mux.i_entry_count > 0)
         {
              /* length of previous spu, stored in spu clearer */
-            int64_t i_length = p_data->i_dts - p_stream->i_last_dts;
+            int64_t i_length = dts_fb_pts( p_data ) - p_stream->i_last_dts;
             if(i_length < 0)
                 i_length = 0;
             assert( p_stream->mux.entry[p_stream->mux.i_entry_count-1].i_length == 0 );
@@ -689,7 +694,7 @@ static int Mux(sout_mux_t *p_mux)
         }
 
         /* Update (Not earlier for SPU!) */
-        p_stream->i_last_dts = p_data->i_dts;
+        p_stream->i_last_dts = dts_fb_pts( p_data );
         if( p_data->i_pts > p_stream->i_last_pts )
             p_stream->i_last_pts = p_data->i_pts;
 
@@ -711,7 +716,7 @@ static int Mux(sout_mux_t *p_mux)
 
         /* update */
         p_stream->mux.i_read_duration += __MAX( 0, p_data->i_length );
-        p_stream->i_last_dts = p_data->i_dts;
+        p_stream->i_last_dts = dts_fb_pts( p_data );
 
         /* write data */
         p_sys->i_pos += p_data->i_buffer;