As a side effect, this workaround the AAC decoding problem after pause/seek
when going through our packetizer (eg: pause/seek with vlc VOD).
But the bug is still there : faad will stop decoding audio forever after
receiving a buffer full of 0 (at least with faad2-2.5 from
audiocoding.com, faad2 from mplayer svn does not show this problem)
block_t *p_ret = p_dec->p_sys->p_block;
if( pp_block == NULL || *pp_block == NULL )
block_t *p_ret = p_dec->p_sys->p_block;
if( pp_block == NULL || *pp_block == NULL )
+ return NULL;
+ if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+ block_Release( *pp_block );
p_block = *pp_block;
*pp_block = NULL;
p_block = *pp_block;
*pp_block = NULL;
block_t *p_block;
if( pp_block == NULL || *pp_block == NULL )
block_t *p_block;
if( pp_block == NULL || *pp_block == NULL )
+ return NULL;
+ if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+ block_Release( *pp_block );
p_block = *pp_block;
*pp_block = NULL;
p_block = *pp_block;
*pp_block = NULL;
decoder_sys_t *p_sys = p_dec->p_sys;
block_t *p_pic;
decoder_sys_t *p_sys = p_dec->p_sys;
block_t *p_pic;
- if( !pp_block || !*pp_block ) return NULL;
+ if( !pp_block || !*pp_block )
+ return NULL;
+ if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+ {
+ p_sys->i_state = STATE_NOSYNC;
+ block_Release( *pp_block );
+ return NULL;
+ }
block_BytestreamPush( &p_sys->bytestream, *pp_block );
block_BytestreamPush( &p_sys->bytestream, *pp_block );
block_t *p_ret = NULL;
uint8_t *p;
block_t *p_ret = NULL;
uint8_t *p;
- if( !pp_block || !*pp_block ) return NULL;
+ if( !pp_block || !*pp_block )
+ return NULL;
+ if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+ {
+ block_Release( *pp_block );
+ return NULL;
+ }
p_block = *pp_block;
*pp_block = NULL;
p_block = *pp_block;
*pp_block = NULL;
if( !pp_block || !*pp_block ) return NULL;
if( !pp_block || !*pp_block ) return NULL;
+ if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+ {
+ block_Release( *pp_block );
+ return NULL;
+ }
+
p_block = *pp_block;
*pp_block = NULL; /* Don't reuse this block */
p_block = *pp_block;
*pp_block = NULL; /* Don't reuse this block */
block_Release( *pp_block );
return NULL;
}
block_Release( *pp_block );
return NULL;
}
-
- if( (*pp_block)->i_flags&BLOCK_FLAG_DISCONTINUITY )
+ if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
p_sys->i_state = STATE_NOSYNC;
{
p_sys->i_state = STATE_NOSYNC;
+ block_Release( *pp_block );
+ return NULL;
}
block_BytestreamPush( &p_sys->bytestream, *pp_block );
}
block_BytestreamPush( &p_sys->bytestream, *pp_block );
if( pp_block == NULL || *pp_block == NULL ) return NULL;
if( pp_block == NULL || *pp_block == NULL ) return NULL;
- if( (*pp_block)->i_flags & BLOCK_FLAG_DISCONTINUITY )
+ if( (*pp_block)->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
p_sys->i_state = STATE_NOSYNC;
if( p_sys->p_frame ) block_ChainRelease( p_sys->p_frame );
{
p_sys->i_state = STATE_NOSYNC;
if( p_sys->p_frame ) block_ChainRelease( p_sys->p_frame );
if( pp_block == NULL || *pp_block == NULL )
return NULL;
if( pp_block == NULL || *pp_block == NULL )
return NULL;
- if( (*pp_block)->i_flags & BLOCK_FLAG_DISCONTINUITY )
- {
- block_Release( *pp_block );
- return NULL;
- }
- if( (*pp_block)->i_flags & BLOCK_FLAG_CORRUPTED )
+ if( (*pp_block)->i_flags & (BLOCK_FLAG_CORRUPTED|BLOCK_FLAG_DISCONTINUITY) )
{
p_sys->i_state = STATE_NOSYNC;
if( p_sys->p_frame )
{
p_sys->i_state = STATE_NOSYNC;
if( p_sys->p_frame )