* 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
#define BLOCK_FLAG_PRIVATE_MASK 0xffff0000
#define BLOCK_FLAG_PRIVATE_SHIFT 16
+typedef void (*block_free_t) (block_t *);
+
struct block_t
{
block_t *p_next;
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
- * Don't mess with it now, if you need it the ask on ML
- */
- void (*pf_release) ( block_t * );
-
- /* It's an object that should be valid as long as the block_t is valid */
- /* It should become a true block manager to reduce malloc/free */
- vlc_object_t *p_manager;
-
- /* Following fields are private, user should never touch it */
- /* XXX never touch that OK !!! the first that access that will
- * have Subversion account removed ;) XXX */
- block_sys_t *p_sys;
+ /* Rudimentary support for overloading block (de)allocation. */
+ block_free_t pf_release;
};
/****************************************************************************
* Blocks functions:
****************************************************************************
- * - block_New : create a new block with the requested size ( >= 0 ), return
+ * - block_Alloc : create a new block with the requested size ( >= 0 ), return
* NULL for failure.
- * - block_Release : release a block allocated with block_New.
+ * - block_Release : release a block allocated with block_Alloc.
* - block_Realloc : realloc a block,
* i_pre: how many bytes to insert before body if > 0, else how many
* bytes of body to skip (the latter can be done without using
* and decrease are supported). Use it as it is optimised.
* - 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( void, block_Init, ( block_t *, void *, size_t ) );
+VLC_EXPORT( block_t *, block_Alloc, ( size_t ) );
+VLC_EXPORT( block_t *, block_Realloc, ( block_t *, ssize_t i_pre, size_t i_body ) );
+
+#define block_New( dummy, size ) block_Alloc(size)
static inline block_t *block_Duplicate( block_t *p_block )
{
- block_t *p_dup = block_New( p_block->p_manager, p_block->i_buffer );
+ block_t *p_dup = block_Alloc( p_block->i_buffer );
if( p_dup == NULL )
return NULL;
p_block->pf_release( p_block );
}
+VLC_EXPORT( block_t *, block_mmap_Alloc, (void *addr, size_t length) );
+VLC_EXPORT( block_t *, block_File, (int fd) );
+
/****************************************************************************
* Chains of blocks functions helper
****************************************************************************
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;
i_length += b->i_length;
}
- g = block_New( p_list->p_manager, i_total );
+ g = block_Alloc( i_total );
block_ChainExtract( p_list, g->p_buffer, g->i_buffer );
g->i_flags = p_list->i_flags;
/****************************************************************************
* 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
* 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( block_fifo_t *, block_FifoNew, ( void ) );
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 ) );
projects / vlc / blobdiff