/*****************************************************************************
- * block.c
+ * block.c: Data blocks management functions
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: block.c,v 1.1 2003/08/23 22:49:50 fenrir Exp $
+ * $Id: block.c,v 1.2 2003/09/02 20:19:26 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@videolan.org>
*
uint8_t *p_allocated_buffer;
int i_allocated_buffer;
- vlc_bool_t b_modify; /* has it be put in modify state */
- int i_duplicated; /* how many times it has been duplicated (only content) */
+ vlc_bool_t b_modify; /* has it been put in modified state */
+ int i_duplicated; /* how many times has the content been
+ * duplicated */
};
return p_mod;
}
+
static block_t *BlockDuplicate( block_t *p_block )
{
block_t *p_dup;
{
vlc_mutex_lock( &p_block->p_sys->lock );
- if( i_prebody < 0 ||
- ( p_block->p_buffer - i_prebody > p_block->p_sys->p_allocated_buffer ) )
+ if( i_prebody < 0 || p_block->p_buffer - i_prebody >
+ p_block->p_sys->p_allocated_buffer )
{
p_block->p_buffer -= i_prebody;
p_block->i_buffer += i_prebody;
i_prebody = 0;
}
if( i_body < 0 ||
- ( p_block->p_buffer + i_body < p_block->p_sys->p_allocated_buffer + p_block->p_sys->i_allocated_buffer ) )
+ p_block->p_buffer + i_body < p_block->p_sys->p_allocated_buffer +
+ p_block->p_sys->i_allocated_buffer )
{
p_block->i_buffer = i_body;
i_body = 0;
{
block_t *p_rea = block_New( p_block->p_manager, i_prebody + i_body );
- memcpy( &p_rea->p_buffer[i_prebody], p_block->p_buffer, p_block->i_buffer );
+ memcpy( &p_rea->p_buffer[i_prebody], p_block->p_buffer,
+ p_block->i_buffer );
return p_rea;
}
i_start = p_rea->p_buffer - p_rea->p_sys->p_allocated_buffer;
p_rea->p_sys->i_allocated_buffer += i_body - p_rea->i_buffer;
- p_rea->p_sys->p_allocated_buffer = realloc( p_rea->p_sys->p_allocated_buffer, p_rea->p_sys->i_allocated_buffer );
+ p_rea->p_sys->p_allocated_buffer =
+ realloc( p_rea->p_sys->p_allocated_buffer,
+ p_rea->p_sys->i_allocated_buffer );
p_rea->p_buffer = &p_rea->p_sys->p_allocated_buffer[i_start];
p_rea->i_buffer = i_body;
return p_block;
}
+
/*****************************************************************************
* Standard block management
*
block_t *p_block;
block_sys_t *p_sys;
-
p_block = block_NewEmpty();
p_block->i_buffer = i_size;
p_block->pf_realloc = BlockRealloc;
/* that should be ok (no comunication between multiple p_vlc) */
- p_block->p_manager = p_obj->p_vlc;
+ p_block->p_manager = VLC_OBJECT( p_obj->p_vlc );
p_block->p_sys = p_sys = malloc( sizeof( block_sys_t ) );
vlc_mutex_init( p_obj, &p_sys->lock );
return p_block;
}
-void block_ChainAppend( block_t **pp_list, block_t *p_block )
+void block_ChainAppend( block_t **pp_list, block_t *p_block )
{
if( *pp_list == NULL )
}
}
-void block_ChainRelease( block_t *p_block )
+void block_ChainRelease( block_t *p_block )
{
while( p_block )
{
/*****************************************************************************
* block_fifo_t managment
*****************************************************************************/
-block_fifo_t * __block_FifoNew ( vlc_object_t *p_obj )
+block_fifo_t *__block_FifoNew( vlc_object_t *p_obj )
{
block_fifo_t *p_fifo;
return p_fifo;
}
-void block_FifoRelease( block_fifo_t *p_fifo )
+void block_FifoRelease( block_fifo_t *p_fifo )
{
block_FifoEmpty( p_fifo );
vlc_cond_destroy( &p_fifo->wait );
free( p_fifo );
}
-void block_FifoEmpty( block_fifo_t *p_fifo )
+void block_FifoEmpty( block_fifo_t *p_fifo )
{
block_t *b;
vlc_mutex_unlock( &p_fifo->lock );
}
-int block_FifoPut ( block_fifo_t *p_fifo, block_t *p_block )
+int block_FifoPut( block_fifo_t *p_fifo, block_t *p_block )
{
int i_size = 0;
vlc_mutex_lock( &p_fifo->lock );
} while( p_block );
- /* warm there is data in this fifo */
+ /* warn there is data in this fifo */
vlc_cond_signal( &p_fifo->wait );
vlc_mutex_unlock( &p_fifo->lock );
return i_size;
}
-block_t * block_FifoGet ( block_fifo_t *p_fifo )
+block_t *block_FifoGet( block_fifo_t *p_fifo )
{
block_t *b;
return( b );
}
-block_t * block_FifoShow ( block_fifo_t *p_fifo )
+block_t *block_FifoShow( block_fifo_t *p_fifo )
{
block_t *b;
}
-block_t * block_FifoGetFrame( block_fifo_t *p_fifo )
+block_t *block_FifoGetFrame( block_fifo_t *p_fifo )
{
block_t *b = NULL;
return b;
}
-
-