[vlc-commits] demux: ts: the date read from the stream is an stime_t

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Jul  5 14:21:39 2018 +0200| [21f926f687089c35b8d1382e0d0571a3185998f5] | committer: Steve Lhomme

demux: ts: the date read from the stream is an stime_t

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

 modules/demux/mpeg/ts_scte.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mpeg/ts_scte.c b/modules/demux/mpeg/ts_scte.c
index 4c39239fa0..1dc4b71f11 100644
--- a/modules/demux/mpeg/ts_scte.c
+++ b/modules/demux/mpeg/ts_scte.c
@@ -81,7 +81,7 @@ void SCTE27_Section_Callback( demux_t *p_demux,
     ts_stream_t *p_pes = (ts_stream_t *) p_pes_cb_data;
     assert( p_pes->p_es->fmt.i_codec == VLC_CODEC_SCTE_27 );
     ts_pmt_t *p_pmt = p_pes->p_es->p_program;
-    vlc_tick_t i_date = p_pmt->pcr.i_current;
+    stime_t i_date = p_pmt->pcr.i_current;
 
     block_t *p_content = block_Alloc( i_sectiondata );
     if( unlikely(!p_content) || unlikely(!p_pes->p_es->id) )
@@ -102,7 +102,7 @@ void SCTE27_Section_Callback( demux_t *p_demux,
         bool is_immediate = p_content->p_buffer[i_offset + 3] & 0x40;
         if( !is_immediate )
         {
-            vlc_tick_t i_display_in = GetDWBE( &p_content->p_buffer[i_offset + 4] );
+            stime_t i_display_in = GetDWBE( &p_content->p_buffer[i_offset + 4] );
             if( i_display_in < i_date )
                 i_date = i_display_in + (1ll << 32);
             else
@@ -111,7 +111,7 @@ void SCTE27_Section_Callback( demux_t *p_demux,
 
     }
 
-    p_content->i_dts = p_content->i_pts = VLC_TICK_0 + i_date * 100 / 9;
+    p_content->i_dts = p_content->i_pts = FROM_SCALE(i_date);
     //PCRFixHandle( p_demux, p_pmt, p_content );
 
     if( p_pes->p_es->id )