* 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 <vlc_block.h>
typedef struct block_bytestream_t
{
- block_t *p_chain;
- block_t *p_block;
- size_t i_offset;
-
+ block_t *p_chain; /**< byte stream head block */
+ block_t *p_block; /**< byte stream read pointer block */
+ size_t i_offset; /**< byte stream read pointer offset within block */
+ /* TODO? add tail pointer for faster push? */
} block_bytestream_t;
/*****************************************************************************
* block_bytestream_t management
*****************************************************************************/
-static inline block_bytestream_t block_BytestreamInit( void )
+static inline void block_BytestreamInit( block_bytestream_t *p_bytestream )
{
- block_bytestream_t bytestream;
-
- bytestream.i_offset = 0;
- bytestream.p_chain = bytestream.p_block = NULL;
-
- return bytestream;
+ p_bytestream->p_chain = p_bytestream->p_block = NULL;
+ p_bytestream->i_offset = 0;
}
static inline void block_BytestreamRelease( block_bytestream_t *p_bytestream )
{
- while( p_bytestream->p_chain )
+ for( block_t *block = p_bytestream->p_chain; block != NULL; )
{
- 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;
+ block_t *p_next = block->p_next;
+
+ block_Release( block );
+ block = 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 );
+ block_BytestreamInit( p_bytestream );
+}
+
+/**
+ * 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 )
+ block_t *block = p_bytestream->p_chain;
+
+ while( block != p_bytestream->p_block )
{
- 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;
+ block_t *p_next = block->p_next;
+
+ block_Release( block );
+ block = p_next;
}
- while( p_bytestream->p_block &&
- (p_bytestream->p_block->i_buffer - p_bytestream->i_offset) == 0 )
+
+ while( block != NULL && block->i_buffer == p_bytestream->i_offset )
{
- 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;
+ block_t *p_next = block->p_next;
+
+ block_Release( block );
+ block = p_next;
p_bytestream->i_offset = 0;
}
+
+ p_bytestream->p_chain = p_bytestream->p_block = block;
}
static inline void block_BytestreamPush( block_bytestream_t *p_bytestream,
if( !p_bytestream->p_block ) p_bytestream->p_block = p_block;
}
+VLC_USED
static inline block_t *block_BytestreamPop( block_bytestream_t *p_bytestream )
{
block_t *p_block;
static inline int block_FindStartcodeFromOffset(
block_bytestream_t *p_bytestream, size_t *pi_offset,
- uint8_t *p_startcode, int i_startcode_length )
+ const uint8_t *p_startcode, int i_startcode_length )
{
block_t *p_block, *p_block_backup = 0;
int i_size = 0;