Hide (+minor changes) block_fifo_t layout

[vlc] / include / vlc_block.h

diff --git a/include/vlc_block.h b/include/vlc_block.h
index 3cd8f6b652c9e5548c6b3c5ea16f6b0f6828d20a..8c09f9436eff68d645d551e1d2e2caaed3a0febd 100644 (file)
--- a/include/vlc_block.h
+++ b/include/vlc_block.h
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if !defined( __LIBVLC__ )
+  #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
 #ifndef _VLC_BLOCK_H
 #define _VLC_BLOCK_H 1
 
@@ -56,7 +60,7 @@ typedef struct block_sys_t block_sys_t;
 #define BLOCK_FLAG_TYPE_B        0x0008
 /** For inter frame when you don't know the real type */
 #define BLOCK_FLAG_TYPE_PB       0x0010
-/** Warm that this block is a header one */
+/** Warn that this block is a header one */
 #define BLOCK_FLAG_HEADER        0x0020
 /** This is the last block of the frame */
 #define BLOCK_FLAG_END_OF_FRAME  0x0040
@@ -102,7 +106,7 @@ struct block_t
 
     /* Following fields are private, user should never touch it */
     /* XXX never touch that OK !!! the first that access that will
-     * have cvs account removed ;) XXX */
+     * have Subversion account removed ;) XXX */
     block_sys_t *p_sys;
 };
 
@@ -129,6 +133,8 @@ VLC_EXPORT( block_t *, block_Realloc,       ( block_t *, int i_pre, int i_body )
 static inline block_t *block_Duplicate( block_t *p_block )
 {
     block_t *p_dup = block_New( p_block->p_manager, p_block->i_buffer );
+    if( p_dup == NULL )
+        return NULL;
 
     p_dup->i_dts     = p_block->i_dts;
     p_dup->i_pts     = p_block->i_pts;
@@ -136,9 +142,7 @@ static inline block_t *block_Duplicate( block_t *p_block )
     p_dup->i_length  = p_block->i_length;
     p_dup->i_rate    = p_block->i_rate;
     p_dup->i_samples = p_block->i_samples;
-
-    if( p_dup && p_block->i_buffer > 0 )
-        memcpy( p_dup->p_buffer, p_block->p_buffer, p_block->i_buffer );
+    memcpy( p_dup->p_buffer, p_block->p_buffer, p_block->i_buffer );
 
     return p_dup;
 }
@@ -248,8 +252,6 @@ static inline block_t *block_ChainGather( block_t *p_list )
 /****************************************************************************
  * Fifos of blocks.
  ****************************************************************************
- * Avoid touching block_fifo_t unless you really know what you are doing.
- * ( Some race conditions has to be correctly handled, like in win32 ;)
  * - block_FifoNew : create and init a new fifo
  * - block_FifoRelease : destroy a fifo and free all blocks in it.
  * - block_FifoEmpty : free all blocks in a fifo
@@ -258,18 +260,9 @@ static inline block_t *block_ChainGather( block_t *p_list )
  * - block_FifoShow : show the first packet of the fifo (and wait if
  *      needed), be carefull, you can use it ONLY if you are sure to be the
  *      only one getting data from the fifo.
+ * - block_FifoCount : how many packets are waiting in the fifo
+ * - block_FifoSize : how many cumulated bytes are waiting in the fifo
  ****************************************************************************/
-struct block_fifo_t
-{
-    vlc_mutex_t         lock;                         /* fifo data lock */
-    vlc_cond_t          wait;         /* fifo data conditional variable */
-
-    int                 i_depth;
-    block_t             *p_first;
-    block_t             **pp_last;
-    int                 i_size;
-};
-
 
 #define block_FifoNew( a ) __block_FifoNew( VLC_OBJECT(a) )
 VLC_EXPORT( block_fifo_t *, __block_FifoNew,    ( vlc_object_t * ) );
@@ -278,5 +271,7 @@ VLC_EXPORT( void,           block_FifoEmpty,    ( block_fifo_t * ) );
 VLC_EXPORT( int,            block_FifoPut,      ( block_fifo_t *, block_t * ) );
 VLC_EXPORT( block_t *,      block_FifoGet,      ( block_fifo_t * ) );
 VLC_EXPORT( block_t *,      block_FifoShow,     ( block_fifo_t * ) );
+VLC_EXPORT( size_t,         block_FifoSize,     ( const block_fifo_t *p_fifo ) );
+VLC_EXPORT( size_t,         block_FifoCount,    ( const block_fifo_t *p_fifo ) );
 
 #endif /* VLC_BLOCK_H */