From f589d6baf66e929b6e70f45dce0d271fecb4a811 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Tue, 8 Dec 2009 10:52:44 +0100 Subject: [PATCH] packetizer_mpeg4video: use VLC_TS_INVALID (refs #3135) --- modules/packetizer/mpeg4video.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/packetizer/mpeg4video.c b/modules/packetizer/mpeg4video.c index 82bcd5d10b..b482c61eb1 100644 --- a/modules/packetizer/mpeg4video.c +++ b/modules/packetizer/mpeg4video.c @@ -219,7 +219,8 @@ static void PacketizeReset( void *p_private, bool b_broken ) p_sys->i_interpolated_pts = p_sys->i_interpolated_dts = - p_sys->i_last_ref_pts = + p_sys->i_last_ref_pts = VLC_TS_INVALID; + p_sys->i_last_time_ref = p_sys->i_time_ref = p_sys->i_last_time = @@ -247,8 +248,8 @@ static int PacketizeValidate( void *p_private, block_t *p_au ) /* We've just started the stream, wait for the first PTS. * We discard here so we can still get the sequence header. */ - if( p_sys->i_interpolated_pts <= 0 && - p_sys->i_interpolated_dts <= 0 ) + if( p_sys->i_interpolated_pts <= VLC_TS_INVALID && + p_sys->i_interpolated_dts <= VLC_TS_INVALID ) { msg_Dbg( p_dec, "need a starting pts/dts" ); return VLC_EGENERIC; @@ -501,9 +502,9 @@ static int ParseVOP( decoder_t *p_dec, block_t *p_vop ) p_sys->i_last_timeincr = i_time_increment; /* Correct interpolated dts when we receive a new pts/dts */ - if( p_vop->i_pts > 0 ) + if( p_vop->i_pts > VLC_TS_INVALID ) p_sys->i_interpolated_pts = p_vop->i_pts; - if( p_vop->i_dts > 0 ) + if( p_vop->i_dts > VLC_TS_INVALID ) p_sys->i_interpolated_dts = p_vop->i_dts; if( (p_sys->i_flags & BLOCK_FLAG_TYPE_B) || !p_sys->b_frame ) @@ -512,16 +513,16 @@ static int ParseVOP( decoder_t *p_dec, block_t *p_vop ) p_sys->i_interpolated_dts = p_sys->i_interpolated_pts; - if( p_vop->i_pts > 0 ) + if( p_vop->i_pts > VLC_TS_INVALID ) p_sys->i_interpolated_dts = p_vop->i_pts; - if( p_vop->i_dts > 0 ) + if( p_vop->i_dts > VLC_TS_INVALID ) p_sys->i_interpolated_dts = p_vop->i_dts; p_sys->i_interpolated_pts = p_sys->i_interpolated_dts; } else { - if( p_sys->i_last_ref_pts > 0 ) + if( p_sys->i_last_ref_pts > VLC_TS_INVALID ) p_sys->i_interpolated_dts = p_sys->i_last_ref_pts; p_sys->i_last_ref_pts = p_sys->i_interpolated_pts; -- 2.39.2