int i_samples; /* Used for audio */
int i_rate;
- int i_buffer;
+ size_t i_buffer;
uint8_t *p_buffer;
/* This way the block_Release can be overloaded
/* 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;
};
* - block_Duplicate : create a copy of a block.
****************************************************************************/
#define block_New( a, b ) __block_New( VLC_OBJECT(a), b )
-VLC_EXPORT( block_t *, __block_New, ( vlc_object_t *, int ) );
-VLC_EXPORT( block_t *, block_Realloc, ( block_t *, int i_pre, int i_body ) );
+VLC_EXPORT( block_t *, __block_New, ( vlc_object_t *, size_t ) );
+VLC_EXPORT( block_t *, block_Realloc, ( block_t *, ssize_t i_pre, size_t 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;
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;
}
p_block = p_next;
}
}
-static int block_ChainExtract( block_t *p_list, void *p_data, int i_max )
+
+static size_t block_ChainExtract( block_t *p_list, void *p_data, size_t i_max )
{
- block_t *b;
- int i_total = 0;
+ size_t i_total = 0;
uint8_t *p = (uint8_t*)p_data;
- for( b = p_list; b != NULL; b = b->p_next )
+ while( p_list && i_max )
{
- int i_copy = __MIN( i_max, b->i_buffer );
- if( i_copy > 0 )
- {
- memcpy( p, b->p_buffer, i_copy );
- i_max -= i_copy;
- i_total += i_copy;
- p += i_copy;
-
- if( i_max == 0 )
- return i_total;
- }
+ size_t i_copy = __MIN( i_max, p_list->i_buffer );
+ memcpy( p, p_list->p_buffer, i_copy );
+ i_max -= i_copy;
+ i_total += i_copy;
+ p += i_copy;
+
+ p_list = p_list->p_next;
}
return i_total;
}
static inline block_t *block_ChainGather( block_t *p_list )
{
- int i_total = 0;
+ size_t i_total = 0;
mtime_t i_length = 0;
block_t *b, *g;
/****************************************************************************
* 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
* - 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
+ * - block_FifoWake : wake ups a thread with block_FifoGet() = NULL
+ * (this is used to wakeup a thread when there is no data to queue)
****************************************************************************/
-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 * ) );
VLC_EXPORT( void, block_FifoRelease, ( block_fifo_t * ) );
VLC_EXPORT( void, block_FifoEmpty, ( block_fifo_t * ) );
-VLC_EXPORT( int, block_FifoPut, ( block_fifo_t *, block_t * ) );
+VLC_EXPORT( size_t, block_FifoPut, ( block_fifo_t *, block_t * ) );
+VLC_EXPORT( void, block_FifoWake, ( block_fifo_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 */