vlc | branch: master | Ilkka Ollakka <[email protected]> | Sat Mar 15 17:15:00 2014 +0200| [c0f7993406074e17c998d2cc0e376b52a397d1dd] | committer: Ilkka Ollakka
block_helper.h: add few unlikely > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c0f7993406074e17c998d2cc0e376b52a397d1dd --- include/vlc_block_helper.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/vlc_block_helper.h b/include/vlc_block_helper.h index fdd5fdb..ef4d752 100644 --- a/include/vlc_block_helper.h +++ b/include/vlc_block_helper.h @@ -105,7 +105,7 @@ static inline block_t *block_BytestreamPop( block_bytestream_t *p_bytestream ) block_BytestreamFlush( p_bytestream ); p_block = p_bytestream->p_block; - if( p_block == NULL ) + if( unlikely( p_block == NULL ) ) { return NULL; } @@ -131,7 +131,7 @@ static inline block_t *block_BytestreamPop( block_bytestream_t *p_bytestream ) static inline int block_SkipByte( block_bytestream_t *p_bytestream ) { /* Most common case first */ - if( p_bytestream->p_block->i_buffer - p_bytestream->i_offset ) + if( likely( p_bytestream->p_block->i_buffer - p_bytestream->i_offset ) ) { p_bytestream->i_offset++; return VLC_SUCCESS; @@ -161,7 +161,7 @@ static inline int block_PeekByte( block_bytestream_t *p_bytestream, uint8_t *p_data ) { /* Most common case first */ - if( p_bytestream->p_block->i_buffer - p_bytestream->i_offset ) + if( likely( p_bytestream->p_block->i_buffer - p_bytestream->i_offset ) ) { *p_data = p_bytestream->p_block->p_buffer[p_bytestream->i_offset]; return VLC_SUCCESS; @@ -190,7 +190,7 @@ static inline int block_GetByte( block_bytestream_t *p_bytestream, uint8_t *p_data ) { /* Most common case first */ - if( p_bytestream->p_block->i_buffer - p_bytestream->i_offset ) + if( likely( p_bytestream->p_block->i_buffer - p_bytestream->i_offset ) ) { *p_data = p_bytestream->p_block->p_buffer[p_bytestream->i_offset]; p_bytestream->i_offset++; @@ -462,7 +462,7 @@ static inline int block_FindStartcodeFromOffset( if( i_size < 0 ) break; } - if( i_size >= 0 ) + if( unlikely( i_size >= 0 ) ) { /* Not enough data, bail out */ return VLC_EGENERIC; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
