[vlc-commits] mux:ogg: the dt/pt for Dirac are not mtime_t

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Jun 13 10:26:43 2018 +0200| [8fbd82f460782cd47df1f810c025ac5063b94556] | committer: Steve Lhomme

mux:ogg: the dt/pt for Dirac are not mtime_t

Rather a count of frames

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

 modules/mux/ogg.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index 815ad80687..28114db10a 100644
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -1661,11 +1661,11 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
         a += 5000;\
     a /= CLOCK_FREQ;
 
-            mtime_t dt = (p_data->i_dts - p_sys->i_start_dts) * p_stream->fmt.video.i_frame_rate /
+            int64_t dt = (p_data->i_dts - p_sys->i_start_dts) * p_stream->fmt.video.i_frame_rate /
                     p_stream->fmt.video.i_frame_rate_base;
             FRAME_ROUND( dt );
 
-            mtime_t pt = (p_data->i_pts - p_sys->i_start_dts - p_stream->i_baseptsdelay ) *
+            int64_t pt = (p_data->i_pts - p_sys->i_start_dts - p_stream->i_baseptsdelay ) *
                     p_stream->fmt.video.i_frame_rate / p_stream->fmt.video.i_frame_rate_base;
             FRAME_ROUND( pt );
 
@@ -1683,7 +1683,7 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
 
             if( p_data->i_flags & BLOCK_FLAG_TYPE_I )
                 p_stream->i_last_keyframe = dt;
-            mtime_t dist = dt - p_stream->i_last_keyframe;
+            int64_t dist = dt - p_stream->i_last_keyframe;
 
             /* Everything increments by two for progressive */
             if ( true )
@@ -1692,7 +1692,7 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
                 dt *=2;
             }
 
-            mtime_t delay = pt - dt;
+            int64_t delay = pt - dt;
             if ( delay < 0 ) delay *= -1;
 
             op.granulepos = (pt - delay) << 31 | (dist&0xff00) << 14