decoder: merge b_exit into b_flushing

[vlc] / include / vlc_block_helper.h

diff --git a/include/vlc_block_helper.h b/include/vlc_block_helper.h
index 903a0f0857a8fcac12b2863d6a0c46b267d473a1..ef4d752c6b5c2f9b240ff407f2fa48664aae9654 100644 (file)
--- 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;
     }
@@ -121,11 +121,9 @@ static inline block_t *block_BytestreamPop( block_bytestream_t *p_bytestream )
     while( p_block->p_next && p_block->p_next->p_next )
         p_block = p_block->p_next;
 
-    {
-        block_t *p_block_old = p_block;
-        p_block = p_block->p_next;
-        p_block_old->p_next = NULL;
-    }
+    block_t *p_block_old = p_block;
+    p_block = p_block->p_next;
+    p_block_old->p_next = NULL;
 
     return p_block;
 }
@@ -133,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;
@@ -163,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;
@@ -192,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++;
@@ -376,7 +374,6 @@ static inline int block_GetBytes( block_bytestream_t *p_bytestream,
         i_offset = 0;
     }
 
-    /* No buffer given, just skip the data */
     p_bytestream->p_block = p_block;
     p_bytestream->i_offset = i_offset + i_copy;
 
@@ -465,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;