From 1aa2b0c983a9e9dc950d08ca44114777ef92c210 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Mon, 7 Dec 2009 08:46:02 +0100 Subject: [PATCH] mash: use VLC_TS_INVALID (refs #3135) --- modules/codec/mash.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/codec/mash.cpp b/modules/codec/mash.cpp index c5dce5bfe3..ffb4555835 100644 --- a/modules/codec/mash.cpp +++ b/modules/codec/mash.cpp @@ -97,7 +97,7 @@ static int OpenDecoder( vlc_object_t *p_this ) (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) return VLC_ENOMEM; /* Misc init */ - p_sys->i_pts = 0; + p_sys->i_pts = VLC_TS_INVALID; p_sys->b_inited = false; p_sys->i_counter = 0; @@ -143,7 +143,8 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) p_block = *pp_block; - if( !p_sys->i_pts && !p_block->i_pts && !p_block->i_dts ) + if( p_sys->i_pts <= VLC_TS_INVALID && p_block->i_pts <= VLC_TS_INVALID && + p_block->i_dts <= VLC_TS_INVALID ) { /* We've just started the stream, wait for the first PTS. */ block_Release( p_block ); @@ -152,11 +153,10 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* Date management */ - if( p_block->i_pts > 0 || p_block->i_dts > 0 ) - { - if( p_block->i_pts > 0 ) p_sys->i_pts = p_block->i_pts; - else if( p_block->i_dts > 0 ) p_sys->i_pts = p_block->i_dts; - } + if( p_block->i_pts > VLC_TS_INVALID ) + p_sys->i_pts = p_block->i_pts; + else if( p_block->i_dts > VLC_TS_INVALID ) + p_sys->i_pts = p_block->i_dts; i_video_header = *(uint32_t*)p_block->p_buffer; /* yes, it is native endian */ sbit = i_video_header >> 29; /* start bit position */ @@ -173,7 +173,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) mvdv = i_video_header & 0x1f; /* vertical motion vector data */ cc = p_block->i_buffer - 4; msg_Dbg( p_dec, "packet size %d", cc ); - + /* Find out p_vdec->i_raw_size */ p_sys->p_decoder->decode( p_block->p_buffer + 4 /*bp?*/, cc /*cc?*/, -- 2.11.4.GIT