Commit b6691ca9 authored by Rafaël Carré's avatar Rafaël Carré

flac: use VLC_TS_INVALID (refs #3135)

parent 09591d85
......@@ -224,6 +224,7 @@ static int OpenDecoder( vlc_object_t *p_this )
p_sys->i_state = STATE_NOSYNC;
p_sys->b_stream_info = false;
p_sys->p_block=NULL;
p_sys->i_pts = VLC_TS_INVALID;
p_sys->bytestream = block_BytestreamInit();
#ifdef USE_LIBFLAC
......@@ -402,7 +403,7 @@ static block_t *PacketizeBlock( decoder_t *p_dec, block_t **pp_block )
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. */
block_Release( *pp_block );
......@@ -444,7 +445,7 @@ static block_t *PacketizeBlock( decoder_t *p_dec, block_t **pp_block )
case STATE_SYNC:
/* New frame, set the Presentation Time Stamp */
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 ) )
{
date_Set( &p_sys->end_date, p_sys->i_pts );
......@@ -526,7 +527,7 @@ static block_t *PacketizeBlock( decoder_t *p_dec, block_t **pp_block )
/* Make sure we don't reuse the same pts twice */
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 */
*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