Commit 7b8d1eba authored by Rafaël Carré's avatar Rafaël Carré

mpga: use VLC_TS_INVALID (refs #3135)

parent 1aa2b0c9
...@@ -149,6 +149,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -149,6 +149,7 @@ static int Open( vlc_object_t *p_this )
p_sys->i_state = STATE_NOSYNC; p_sys->i_state = STATE_NOSYNC;
date_Set( &p_sys->end_date, 0 ); date_Set( &p_sys->end_date, 0 );
p_sys->bytestream = block_BytestreamInit(); p_sys->bytestream = block_BytestreamInit();
p_sys->i_pts = VLC_TS_INVALID;
p_sys->b_discontinuity = false; p_sys->b_discontinuity = false;
/* Set output properties */ /* Set output properties */
...@@ -216,7 +217,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -216,7 +217,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
return NULL; return NULL;
} }
if( !date_Get( &p_sys->end_date ) && !(*pp_block)->i_pts ) if( !date_Get( &p_sys->end_date ) && (*pp_block)->i_pts <= VLC_TS_INVALID )
{ {
/* We've just started the stream, wait for the first PTS. */ /* We've just started the stream, wait for the first PTS. */
msg_Dbg( p_dec, "waiting for PTS" ); msg_Dbg( p_dec, "waiting for PTS" );
...@@ -254,7 +255,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -254,7 +255,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
case STATE_SYNC: case STATE_SYNC:
/* New frame, set the Presentation Time Stamp */ /* New frame, set the Presentation Time Stamp */
p_sys->i_pts = p_sys->bytestream.p_block->i_pts; p_sys->i_pts = p_sys->bytestream.p_block->i_pts;
if( p_sys->i_pts != 0 && if( p_sys->i_pts > VLC_TS_INVALID &&
p_sys->i_pts != date_Get( &p_sys->end_date ) ) p_sys->i_pts != date_Get( &p_sys->end_date ) )
{ {
date_Set( &p_sys->end_date, p_sys->i_pts ); date_Set( &p_sys->end_date, p_sys->i_pts );
...@@ -470,7 +471,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -470,7 +471,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
/* Make sure we don't reuse the same pts twice */ /* Make sure we don't reuse the same pts twice */
if( p_sys->i_pts == p_sys->bytestream.p_block->i_pts ) if( p_sys->i_pts == p_sys->bytestream.p_block->i_pts )
p_sys->i_pts = p_sys->bytestream.p_block->i_pts = 0; p_sys->i_pts = p_sys->bytestream.p_block->i_pts = VLC_TS_INVALID;
/* So p_block doesn't get re-added several times */ /* So p_block doesn't get re-added several times */
*pp_block = block_BytestreamPop( &p_sys->bytestream ); *pp_block = block_BytestreamPop( &p_sys->bytestream );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment