X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_block_helper.h;h=654d26bc10c434b31f681a75bb462daf85929e8a;hb=c8b5e32b7cab70921fca129c3b9d46fcd5acdf2b;hp=69e5b464004ef5d04c3e7e88224ba9efabd71211;hpb=3e59b60f0686a4a11bb3dca794586b394371cc56;p=vlc diff --git a/include/vlc_block_helper.h b/include/vlc_block_helper.h index 69e5b46400..654d26bc10 100644 --- a/include/vlc_block_helper.h +++ b/include/vlc_block_helper.h @@ -1,8 +1,8 @@ /***************************************************************************** * vlc_block_helper.h: Helper functions for data blocks management. ***************************************************************************** - * Copyright (C) 2003 VideoLAN - * $Id: vlc_block_helper.h,v 1.7 2003/12/07 12:11:13 gbazin Exp $ + * Copyright (C) 2003 the VideoLAN team + * $Id$ * * Authors: Gildas Bazin * @@ -18,26 +18,26 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#ifndef _VLC_BLOCK_HELPER_H -#define _VLC_BLOCK_HELPER_H 1 +#ifndef VLC_BLOCK_HELPER_H +#define VLC_BLOCK_HELPER_H 1 + +#include typedef struct block_bytestream_t { block_t *p_chain; block_t *p_block; - int i_offset; + size_t i_offset; } block_bytestream_t; -#define block_BytestreamInit( a ) __block_BytestreamInit( VLC_OBJECT(a) ) - /***************************************************************************** * block_bytestream_t management *****************************************************************************/ -static inline block_bytestream_t __block_BytestreamInit( vlc_object_t *p_obj ) +static inline block_bytestream_t block_BytestreamInit( void ) { block_bytestream_t bytestream; @@ -60,6 +60,19 @@ static inline void block_BytestreamRelease( block_bytestream_t *p_bytestream ) p_bytestream->p_chain = p_bytestream->p_block = NULL; } +/** + * It flush all data (read and unread) from a block_bytestream_t. + */ +static inline void block_BytestreamEmpty( block_bytestream_t *p_bytestream ) +{ + block_BytestreamRelease( p_bytestream ); + + *p_bytestream = block_BytestreamInit(); +} + +/** + * It flushes all already read data from a block_bytestream_t. + */ static inline void block_BytestreamFlush( block_bytestream_t *p_bytestream ) { while( p_bytestream->p_chain != p_bytestream->p_block ) @@ -87,6 +100,7 @@ static inline void block_BytestreamPush( block_bytestream_t *p_bytestream, if( !p_bytestream->p_block ) p_bytestream->p_block = p_block; } +LIBVLC_USED static inline block_t *block_BytestreamPop( block_bytestream_t *p_bytestream ) { block_t *p_block; @@ -210,10 +224,10 @@ static inline int block_GetByte( block_bytestream_t *p_bytestream, } static inline int block_WaitBytes( block_bytestream_t *p_bytestream, - int i_data ) + size_t i_data ) { block_t *p_block; - int i_offset, i_copy, i_size; + size_t i_offset, i_copy, i_size; /* Check we have that much data */ i_offset = p_bytestream->i_offset; @@ -238,10 +252,10 @@ static inline int block_WaitBytes( block_bytestream_t *p_bytestream, } static inline int block_SkipBytes( block_bytestream_t *p_bytestream, - int i_data ) + size_t i_data ) { block_t *p_block; - int i_offset, i_copy; + size_t i_offset, i_copy; /* Check we have that much data */ i_offset = p_bytestream->i_offset; @@ -269,10 +283,10 @@ static inline int block_SkipBytes( block_bytestream_t *p_bytestream, } static inline int block_PeekBytes( block_bytestream_t *p_bytestream, - uint8_t *p_data, int i_data ) + uint8_t *p_data, size_t i_data ) { block_t *p_block; - int i_offset, i_copy, i_size; + size_t i_offset, i_copy, i_size; /* Check we have that much data */ i_offset = p_bytestream->i_offset; @@ -319,10 +333,10 @@ static inline int block_PeekBytes( block_bytestream_t *p_bytestream, } static inline int block_GetBytes( block_bytestream_t *p_bytestream, - uint8_t *p_data, int i_data ) + uint8_t *p_data, size_t i_data ) { block_t *p_block; - int i_offset, i_copy, i_size; + size_t i_offset, i_copy, i_size; /* Check we have that much data */ i_offset = p_bytestream->i_offset; @@ -373,10 +387,10 @@ static inline int block_GetBytes( block_bytestream_t *p_bytestream, } static inline int block_PeekOffsetBytes( block_bytestream_t *p_bytestream, - int i_peek_offset, uint8_t *p_data, int i_data ) + size_t i_peek_offset, uint8_t *p_data, size_t i_data ) { block_t *p_block; - int i_offset, i_copy, i_size; + size_t i_offset, i_copy, i_size; /* Check we have that much data */ i_offset = p_bytestream->i_offset; @@ -437,11 +451,12 @@ static inline int block_PeekOffsetBytes( block_bytestream_t *p_bytestream, } static inline int block_FindStartcodeFromOffset( - block_bytestream_t *p_bytestream, int *pi_offset, - uint8_t *p_startcode, int i_startcode_length ) + block_bytestream_t *p_bytestream, size_t *pi_offset, + const uint8_t *p_startcode, int i_startcode_length ) { block_t *p_block, *p_block_backup = 0; - int i_size, i_offset, i_offset_backup = 0; + int i_size = 0; + size_t i_offset, i_offset_backup = 0; int i_caller_offset_backup = 0, i_match; /* Find the right place */ @@ -460,9 +475,9 @@ static inline int block_FindStartcodeFromOffset( } /* Begin the search. - * We first look for an occurence of the 1st startcode byte and + * We first look for an occurrence of the 1st startcode byte and * if found, we do a more thorough check. */ - i_size = p_block->i_buffer + i_size; + i_size += p_block->i_buffer; *pi_offset -= i_size; i_match = 0; for( ; p_block != NULL; p_block = p_block->p_next )