X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_block_helper.h;h=7aa1989af0042ff8127b219ba3e24951367f4a4d;hb=f659703fb4033420e0607d34bc7cd880a5802ea7;hp=e5e160dd1112e534c7346816e02dbd411583b571;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc

diff --git a/include/vlc_block_helper.h b/include/vlc_block_helper.h
index e5e160dd11..7aa1989af0 100644
--- a/include/vlc_block_helper.h
+++ b/include/vlc_block_helper.h
@@ -21,8 +21,8 @@
  * 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>
 
@@ -30,16 +30,15 @@ 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 )
+LIBVLC_USED
+static inline block_bytestream_t block_BytestreamInit( void )
 {
     block_bytestream_t bytestream;
 
@@ -62,6 +61,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 )
@@ -89,6 +101,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;
@@ -212,10 +225,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;
@@ -240,10 +253,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;
@@ -271,10 +284,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;
@@ -321,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;
@@ -375,10 +388,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;
@@ -439,11 +452,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 */
@@ -464,7 +478,7 @@ static inline int block_FindStartcodeFromOffset(
     /* 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 + 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 )