X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_block_helper.h;h=7aa1989af0042ff8127b219ba3e24951367f4a4d;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=fe42def3be6533dfbf6bd4cb78675bb7748fbd58;hpb=a1b3ffaedfc8e91a6e8146790204091601f4a70f;p=vlc diff --git a/include/vlc_block_helper.h b/include/vlc_block_helper.h index fe42def3be..7aa1989af0 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.2 2003/09/30 20:36:46 gbazin Exp $ + * Copyright (C) 2003 the VideoLAN team + * $Id$ * * Authors: Gildas Bazin * @@ -18,37 +18,63 @@ * * 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; -} block_bytestream_t; + size_t i_offset; -#define block_BytestreamInit( a, b, c ) __block_BytestreamInit( VLC_OBJECT(a), b, c ) +} block_bytestream_t; /***************************************************************************** * block_bytestream_t management *****************************************************************************/ -static inline block_bytestream_t __block_BytestreamInit( vlc_object_t *p_obj, - block_t *p_block, int i_offset ) +LIBVLC_USED +static inline block_bytestream_t block_BytestreamInit( void ) { block_bytestream_t bytestream; - bytestream.i_offset = i_offset; - bytestream.p_block = p_block; - bytestream.p_chain = p_block; + bytestream.i_offset = 0; + bytestream.p_chain = bytestream.p_block = NULL; return bytestream; } -static inline block_t *block_BytestreamFlush( block_bytestream_t *p_bytestream) +static inline void block_BytestreamRelease( block_bytestream_t *p_bytestream ) +{ + while( p_bytestream->p_chain ) + { + block_t *p_next; + p_next = p_bytestream->p_chain->p_next; + p_bytestream->p_chain->pf_release( p_bytestream->p_chain ); + p_bytestream->p_chain = p_next; + } + p_bytestream->i_offset = 0; + 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 ) { @@ -57,8 +83,55 @@ static inline block_t *block_BytestreamFlush( block_bytestream_t *p_bytestream) p_bytestream->p_chain->pf_release( p_bytestream->p_chain ); p_bytestream->p_chain = p_next; } + while( p_bytestream->p_block && + (p_bytestream->p_block->i_buffer - p_bytestream->i_offset) == 0 ) + { + block_t *p_next; + p_next = p_bytestream->p_chain->p_next; + p_bytestream->p_chain->pf_release( p_bytestream->p_chain ); + p_bytestream->p_chain = p_bytestream->p_block = p_next; + p_bytestream->i_offset = 0; + } +} + +static inline void block_BytestreamPush( block_bytestream_t *p_bytestream, + block_t *p_block ) +{ + block_ChainAppend( &p_bytestream->p_chain, p_block ); + 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; + + block_BytestreamFlush( p_bytestream ); + + p_block = p_bytestream->p_block; + if( p_block == NULL ) + { + return NULL; + } + else if( !p_block->p_next ) + { + p_block->p_buffer += p_bytestream->i_offset; + p_block->i_buffer -= p_bytestream->i_offset; + p_bytestream->i_offset = 0; + p_bytestream->p_chain = p_bytestream->p_block = NULL; + return p_block; + } + + 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; + } - return p_bytestream->p_chain; + return p_block; } static inline int block_SkipByte( block_bytestream_t *p_bytestream ) @@ -151,11 +224,39 @@ static inline int block_GetByte( block_bytestream_t *p_bytestream, return VLC_EGENERIC; } +static inline int block_WaitBytes( block_bytestream_t *p_bytestream, + size_t i_data ) +{ + block_t *p_block; + size_t i_offset, i_copy, i_size; + + /* Check we have that much data */ + i_offset = p_bytestream->i_offset; + i_size = i_data; + i_copy = 0; + for( p_block = p_bytestream->p_block; + p_block != NULL; p_block = p_block->p_next ) + { + i_copy = __MIN( i_size, p_block->i_buffer - i_offset ); + i_size -= i_copy; + i_offset = 0; + + if( !i_size ) break; + } + + if( i_size ) + { + /* Not enough data, bail out */ + return VLC_EGENERIC; + } + return VLC_SUCCESS; +} + 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; @@ -165,9 +266,10 @@ static inline int block_SkipBytes( block_bytestream_t *p_bytestream, { i_copy = __MIN( i_data, p_block->i_buffer - i_offset ); i_data -= i_copy; - i_offset = 0; if( !i_data ) break; + + i_offset = 0; } if( i_data ) @@ -177,15 +279,15 @@ static inline int block_SkipBytes( block_bytestream_t *p_bytestream, } p_bytestream->p_block = p_block; - p_bytestream->i_offset = i_copy; + p_bytestream->i_offset = i_offset + i_copy; return VLC_SUCCESS; } 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; @@ -232,10 +334,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; @@ -273,23 +375,23 @@ static inline int block_GetBytes( block_bytestream_t *p_bytestream, p_data += i_copy; } - i_offset = 0; - if( !i_size ) break; + + i_offset = 0; } /* No buffer given, just skip the data */ p_bytestream->p_block = p_block; - p_bytestream->i_offset = i_copy; + p_bytestream->i_offset = i_offset + i_copy; return VLC_SUCCESS; } 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; @@ -320,13 +422,14 @@ static inline int block_PeekOffsetBytes( block_bytestream_t *p_bytestream, { i_copy = __MIN( i_size, p_block->i_buffer - i_offset ); i_size -= i_copy; - i_offset = 0; if( !i_size ) break; + + i_offset = 0; } /* Copy the data */ - i_offset = i_copy; + i_offset += i_copy; i_size = i_data; i_copy = 0; for( ; p_block != NULL; p_block = p_block->p_next ) @@ -348,4 +451,74 @@ static inline int block_PeekOffsetBytes( block_bytestream_t *p_bytestream, return VLC_SUCCESS; } +static inline int block_FindStartcodeFromOffset( + 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 = 0; + size_t i_offset, i_offset_backup = 0; + int i_caller_offset_backup = 0, i_match; + + /* Find the right place */ + i_size = *pi_offset + p_bytestream->i_offset; + for( p_block = p_bytestream->p_block; + p_block != NULL; p_block = p_block->p_next ) + { + i_size -= p_block->i_buffer; + if( i_size < 0 ) break; + } + + if( i_size >= 0 ) + { + /* Not enough data, bail out */ + return VLC_EGENERIC; + } + + /* Begin the search. + * 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; + *pi_offset -= i_size; + i_match = 0; + for( ; p_block != NULL; p_block = p_block->p_next ) + { + for( i_offset = i_size; i_offset < p_block->i_buffer; i_offset++ ) + { + if( p_block->p_buffer[i_offset] == p_startcode[i_match] ) + { + if( !i_match ) + { + p_block_backup = p_block; + i_offset_backup = i_offset; + i_caller_offset_backup = *pi_offset; + } + + if( i_match + 1 == i_startcode_length ) + { + /* We have it */ + *pi_offset += i_offset - i_match; + return VLC_SUCCESS; + } + + i_match++; + } + else if ( i_match ) + { + /* False positive */ + p_block = p_block_backup; + i_offset = i_offset_backup; + *pi_offset = i_caller_offset_backup; + i_match = 0; + } + + } + i_size = 0; + *pi_offset += i_offset; + } + + *pi_offset -= i_match; + return VLC_EGENERIC; +} + #endif /* VLC_BLOCK_HELPER_H */