/*****************************************************************************
* block.c: Data blocks management functions
*****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: block.c,v 1.5 2003/11/22 14:42:47 fenrir Exp $
+ * Copyright (C) 2003-2004 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@videolan.org>
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <stdlib.h>
-#include <stdarg.h>
#include <vlc/vlc.h>
#include "vlc_block.h"
+/*****************************************************************************
+ * Block functions.
+ *****************************************************************************/
/* private */
struct block_sys_t
{
- vlc_mutex_t lock;
-
uint8_t *p_allocated_buffer;
int i_allocated_buffer;
-
- vlc_bool_t b_modify; /* has it been put in modified state */
- int i_duplicated; /* how many times has the content been
- * duplicated */
-
};
-static void BlockRelease( block_t *p_block )
-{
- vlc_mutex_lock( &p_block->p_sys->lock );
-
- p_block->p_sys->i_duplicated--;
- if( p_block->p_sys->i_duplicated < 0 )
- {
- vlc_mutex_unlock( &p_block->p_sys->lock );
- vlc_mutex_destroy( &p_block->p_sys->lock );
- free( p_block->p_sys->p_allocated_buffer );
- free( p_block->p_sys );
- free( p_block );
-
- return;
- }
-
- vlc_mutex_unlock( &p_block->p_sys->lock );
- free( p_block );
-}
-
-static block_t *__BlockDupContent( block_t *p_block )
-{
- block_t *p_dup;
-
- p_dup = block_New( p_block->p_manager, p_block->i_buffer );
- memcpy( p_dup->p_buffer, p_block->p_buffer, p_block->i_buffer );
- p_dup->b_frame_display = p_block->b_frame_display;
- p_dup->b_frame_start = p_block->b_frame_start;
- p_dup->i_pts = p_block->i_pts;
- p_dup->i_dts = p_block->i_dts;
- p_dup->b_discontinuity = p_block->b_discontinuity;
-
- return p_dup;
-}
+#define BLOCK_PADDING_SIZE 32
+static void BlockRelease( block_t * );
-static block_t *BlockModify( block_t *p_block, vlc_bool_t b_will_modify )
+block_t *__block_New( vlc_object_t *p_obj, int i_size )
{
- block_t *p_mod = p_block; /* by default */
+ /* We do only one malloc
+ * TODO bench if doing 2 malloc but keeping a pool of buffer is better
+ * 16 -> align on 16
+ * 2 * BLOCK_PADDING_SIZE -> pre + post padding
+ */
+ block_sys_t *p_sys;
+ const int i_alloc = i_size + 2 * BLOCK_PADDING_SIZE + 16;
+ block_t *p_block =
+ malloc( sizeof( block_t ) + sizeof( block_sys_t ) + i_alloc );
- vlc_mutex_lock( &p_block->p_sys->lock );
+ if( p_block == NULL ) return NULL;
- if( p_block->p_sys->b_modify == b_will_modify )
- {
- vlc_mutex_unlock( &p_block->p_sys->lock );
- return p_block;
- }
+ /* Fill opaque data */
+ p_sys = (block_sys_t*)( (uint8_t*)p_block + sizeof( block_t ) );
+ p_sys->i_allocated_buffer = i_alloc;
+ p_sys->p_allocated_buffer = (uint8_t*)p_block + sizeof( block_t ) +
+ sizeof( block_sys_t );
- if( p_block->p_sys->i_duplicated == 0 )
- {
- p_block->p_sys->b_modify = b_will_modify;
- vlc_mutex_unlock( &p_block->p_sys->lock );
- return p_block;
- }
-
- /* FIXME we could avoid that
- * we just need to create a new p_sys with new mem FIXME */
- p_mod = __BlockDupContent( p_block );
- vlc_mutex_unlock( &p_block->p_sys->lock );
+ /* Fill all fields */
+ p_block->p_next = NULL;
+ p_block->p_prev = NULL;
+ p_block->i_flags = 0;
+ p_block->i_pts = 0;
+ p_block->i_dts = 0;
+ p_block->i_length = 0;
+ p_block->i_rate = 0;
+ p_block->i_buffer = i_size;
+ p_block->p_buffer =
+ &p_sys->p_allocated_buffer[BLOCK_PADDING_SIZE +
+ 16 - ((uintptr_t)p_sys->p_allocated_buffer % 16 )];
+ p_block->pf_release = BlockRelease;
- BlockRelease( p_block );
+ /* Is ok, as no comunication between p_vlc */
+ p_block->p_manager = VLC_OBJECT( p_obj->p_libvlc );
+ p_block->p_sys = p_sys;
- return p_mod;
+ return p_block;
}
-static block_t *BlockDuplicate( block_t *p_block )
+block_t *block_Realloc( block_t *p_block, int i_prebody, int i_body )
{
- block_t *p_dup;
+ int i_buffer_size;
- vlc_mutex_lock( &p_block->p_sys->lock );
- if( !p_block->p_sys->b_modify )
+ if( p_block->pf_release != BlockRelease )
{
- p_block->p_sys->i_duplicated++;
- vlc_mutex_unlock( &p_block->p_sys->lock );
- p_dup = block_NewEmpty();
- memcpy( p_dup, p_block, sizeof( block_t ) );
- p_dup->p_next = NULL;
- return p_dup;
+ /* Special case when pf_release if overloaded
+ * TODO if used one day, them implement it in a smarter way */
+ block_t *p_dup = block_Duplicate( p_block );
+ block_Release( p_block );
+
+ p_block = p_dup;
}
- p_dup = __BlockDupContent( p_block );
- vlc_mutex_unlock( &p_block->p_sys->lock );
- return p_dup;
-}
+ i_buffer_size = i_prebody + i_body;
-static block_t *BlockRealloc( block_t *p_block, int i_prebody, int i_body )
-{
+ if( i_body < 0 || i_buffer_size <= 0 ) return NULL;
- 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( p_block->p_buffer - i_prebody > p_block->p_sys->p_allocated_buffer &&
+ p_block->p_buffer - i_prebody < p_block->p_sys->p_allocated_buffer +
+ p_block->p_sys->i_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 +
+ if( 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;
+ p_block->i_buffer = i_buffer_size;
i_body = 0;
}
- vlc_mutex_unlock( &p_block->p_sys->lock );
- if( i_prebody > 0 )
+ if( i_body > 0 || i_prebody > 0 )
{
- block_t *p_rea = block_New( p_block->p_manager, i_prebody + i_body );
+ block_t *p_rea = block_New( p_block->p_manager, i_buffer_size );
- memcpy( &p_rea->p_buffer[i_prebody], p_block->p_buffer,
- p_block->i_buffer );
+ p_rea->i_dts = p_block->i_dts;
+ p_rea->i_pts = p_block->i_pts;
+ p_rea->i_flags = p_block->i_flags;
+ p_rea->i_length = p_block->i_length;
+ p_rea->i_rate = p_block->i_rate;
+ p_rea->i_samples = p_block->i_samples;
- return p_rea;
- }
-
- if( i_body > 0 )
- {
- int i_start;
- block_t *p_rea = BlockModify( p_block, VLC_TRUE );
-
- i_start = p_rea->p_buffer - p_rea->p_sys->p_allocated_buffer;
+ memcpy( p_rea->p_buffer + i_prebody, p_block->p_buffer,
+ __MIN( p_block->i_buffer, p_rea->i_buffer - i_prebody ) );
- 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_buffer = &p_rea->p_sys->p_allocated_buffer[i_start];
- p_rea->i_buffer = i_body;
+ block_Release( p_block );
return p_rea;
}
return p_block;
}
-/*****************************************************************************
- * Standard block management
- *
- *****************************************************************************/
-/* to be used by other block management */
-block_t *block_NewEmpty( void )
-{
- block_t *p_block;
-
- p_block = malloc( sizeof( block_t ) );
- memset( p_block, 0, sizeof( block_t ) );
-
- p_block->p_next = NULL;
- p_block->b_frame_display= VLC_TRUE;
- p_block->b_frame_start = VLC_FALSE;
- p_block->i_pts = 0;
- p_block->i_dts = 0;
- p_block->i_length = 0;
-
- p_block->b_discontinuity= VLC_FALSE;
-
- p_block->i_buffer = 0;
- p_block->p_buffer = NULL;
-
- p_block->pf_release = NULL;
- p_block->pf_duplicate = NULL;
- p_block->pf_modify = NULL;
- p_block->pf_realloc = NULL;
-
- p_block->p_manager = NULL;
- p_block->p_sys = NULL;
- return p_block;
-}
-
-block_t *__block_New( vlc_object_t *p_obj, int i_size )
-{
- block_t *p_block;
- block_sys_t *p_sys;
-
- p_block = block_NewEmpty();
-
- p_block->i_buffer = i_size;
- if( i_size > 0 )
- {
- p_block->p_buffer = malloc( i_size );
- }
-
- p_block->pf_release = BlockRelease;
- p_block->pf_duplicate = BlockDuplicate;
- p_block->pf_modify = BlockModify;
- p_block->pf_realloc = BlockRealloc;
-
- /* that should be ok (no comunication between multiple 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 );
- p_sys->p_allocated_buffer = p_block->p_buffer;
- p_sys->i_allocated_buffer = p_block->i_buffer;
- p_sys->i_duplicated = 0;
- p_sys->b_modify = VLC_TRUE;
-
- return p_block;
-}
-
-void block_ChainAppend( block_t **pp_list, block_t *p_block )
-{
-
- if( *pp_list == NULL )
- {
- *pp_list = p_block;
- }
- else
- {
- block_t *p = *pp_list;
-
- while( p->p_next )
- {
- p = p->p_next;
- }
- p->p_next = p_block;
- }
-}
-
-void block_ChainRelease( block_t *p_block )
-{
- while( p_block )
- {
- block_t *p_next;
- p_next = p_block->p_next;
- p_block->pf_release( p_block );
- p_block = p_next;
- }
-}
-
-int block_ChainExtract( block_t *p_list, void *p_data, int i_max )
+static void BlockRelease( block_t *p_block )
{
- block_t *b;
- int i_total = 0;
- uint8_t *p = p_data;
-
- for( b = p_list; b != NULL; b = b->p_next )
- {
- int i_copy;
-
- 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;
- }
- }
- }
- return i_total;
+ free( p_block );
}
-block_t *block_ChainGather( block_t *p_list )
-{
- int i_total = 0;
- block_t *b, *g;
-
- if( p_list->p_next == NULL )
- {
- /* only one, so no need */
- return p_list;
- }
-
- for( b = p_list; b != NULL; b = b->p_next )
- {
- i_total += b->i_buffer;
- }
-
- g = block_New( p_list->p_manager, i_total );
- block_ChainExtract( p_list, g->p_buffer, g->i_buffer );
-
- g->b_frame_display = p_list->b_frame_display;
- g->b_frame_start = p_list->b_frame_start;
- g->i_pts = p_list->i_pts;
- g->i_dts = p_list->i_dts;
-
- /* free p_list */
- block_ChainRelease( p_list );
- return g;
-}
/*****************************************************************************
* block_fifo_t management
{
block_fifo_t *p_fifo;
- p_fifo = malloc( sizeof( vlc_object_t ) );
+ p_fifo = malloc( sizeof( block_fifo_t ) );
vlc_mutex_init( p_obj, &p_fifo->lock );
vlc_cond_init( p_obj, &p_fifo->wait );
- p_fifo->i_depth = 0;
+ p_fifo->i_depth = p_fifo->i_size = 0;
p_fifo->p_first = NULL;
p_fifo->pp_last = &p_fifo->p_first;
b = p_next;
}
- p_fifo->i_depth = 0;
+ p_fifo->i_depth = p_fifo->i_size = 0;
p_fifo->p_first = NULL;
p_fifo->pp_last = &p_fifo->p_first;
vlc_mutex_unlock( &p_fifo->lock );
*p_fifo->pp_last = p_block;
p_fifo->pp_last = &p_block->p_next;
p_fifo->i_depth++;
+ p_fifo->i_size += p_block->i_buffer;
p_block = p_block->p_next;
vlc_mutex_lock( &p_fifo->lock );
- if( p_fifo->p_first == NULL )
+ /* We do a while here because there is a race condition in the
+ * win32 implementation of vlc_cond_wait() (We can't be sure the fifo
+ * hasn't been emptied again since we were signaled). */
+ while( p_fifo->p_first == NULL )
{
vlc_cond_wait( &p_fifo->wait, &p_fifo->lock );
}
p_fifo->p_first = b->p_next;
p_fifo->i_depth--;
+ p_fifo->i_size -= b->i_buffer;
if( p_fifo->p_first == NULL )
{
vlc_mutex_unlock( &p_fifo->lock );
b->p_next = NULL;
- return( b );
+ return b;
}
block_t *block_FifoShow( block_fifo_t *p_fifo )
}
-block_t *block_FifoGetFrame( block_fifo_t *p_fifo )
-{
- block_t *b = NULL;
-
- for( ;; )
- {
- block_t *p_next;
- block_ChainAppend( &b, block_FifoGet( p_fifo ) );
- p_next = block_FifoShow( p_fifo );
- if( p_next == NULL || p_next->b_frame_start )
- {
- break;
- }
- }
-
- return b;
-}
projects / vlc / blobdiff