* input_ps.c: PS demux and packet management
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_ps.c,v 1.20 2001/04/28 03:36:25 sam Exp $
+ * $Id: input_ps.c,v 1.25 2001/05/30 17:03:12 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Cyril Deguet <asmax@via.ecp.fr>
#define input p_function_list->functions.input
p_function_list->pf_probe = PSProbe;
input.pf_init = PSInit;
- input.pf_open = input_FileOpen;
- input.pf_close = input_FileClose;
+ input.pf_open = NULL; /* Set in PSInit */
+ input.pf_close = NULL;
input.pf_end = PSEnd;
input.pf_set_area = NULL;
input.pf_read = PSRead;
static void PSInit( input_thread_t * p_input )
{
thread_ps_data_t * p_method;
- packet_cache_t * p_packet_cache;
+ packet_cache_t * p_packet_cache;
if( (p_method =
(thread_ps_data_t *)malloc( sizeof(thread_ps_data_t) )) == NULL )
return;
}
p_input->p_method_data = (void *)p_packet_cache;
+
+ /* Set callback */
+ p_input->pf_open = p_input->pf_file_open;
+ p_input->pf_close = p_input->pf_file_close;
+
+ /* Initialize packet cache mutex */
+ vlc_mutex_init( &p_packet_cache->lock );
/* allocates the data cache */
p_packet_cache->data.p_stack = malloc( DATA_CACHE_SIZE *
if ( p_packet_cache->data.p_stack == NULL )
{
intf_ErrMsg( "Out of memory" );
- p_input->b_error = 1;
- return;
+ p_input->b_error = 1;
+ return;
}
p_packet_cache->data.l_index = 0;
break;
case LPCM_AUDIO_ES:
- /* FIXME ! */
+ if( main_GetIntVariable( INPUT_CHANNEL_VAR, 0 )
+ == ((p_es->i_id & 0x1F00) >> 8) )
+ switch( main_GetIntVariable( INPUT_AUDIO_VAR, 0 ) )
+ {
+ case 0:
+ main_PutIntVariable( INPUT_AUDIO_VAR,
+ REQUESTED_LPCM );
+ case REQUESTED_LPCM:
+ input_SelectES( p_input, p_es );
+ }
break;
}
}
*****************************************************************************/
static void PSEnd( input_thread_t * p_input )
{
+ vlc_mutex_destroy( &((packet_cache_t *)p_input->p_plugin_data)->lock );
free( p_input->p_plugin_data );
}
/* It is common for MPEG-1 streams to pad with zeros
* (although it is forbidden by the recommendation), so
* don't bother everybody in this case. */
- intf_WarnMsg( 1, "Garbage at input (%.8x)", i_startcode );
+ intf_WarnMsg( 3, "Garbage at input (%.8x)", i_startcode );
}
while( (i_startcode & 0xFFFFFF00) != 0x100L )
return NULL;
}
+ vlc_mutex_lock( &p_cache->lock );
+
/* Checks whether the data cache is empty */
if( p_cache->data.l_index == 0 )
{
if ( (p_data = malloc( sizeof(data_packet_t) )) == NULL )
{
intf_ErrMsg( "Out of memory" );
+ vlc_mutex_unlock( &p_cache->lock );
return NULL;
}
#ifdef TRACE_INPUT
== NULL )
{
intf_ErrMsg( "NULL packet in the data cache" );
+ vlc_mutex_unlock( &p_cache->lock );
return NULL;
}
}
/* Checks whether the buffer cache is empty */
if( p_cache->small.l_index == 0 )
{
- /* Allocates a new packet */
+ /* Allocates a new packet */
if ( (p_data->p_buffer = malloc( l_size )) == NULL )
{
intf_DbgMsg( "Out of memory" );
free( p_data );
+ vlc_mutex_unlock( &p_cache->lock );
return NULL;
}
#ifdef TRACE_INPUT
{
intf_ErrMsg( "NULL packet in the small buffer cache" );
free( p_data );
+ vlc_mutex_unlock( &p_cache->lock );
return NULL;
}
- /* Reallocates the packet if it is too small or too large */
+ /* Reallocates the packet if it is too small or too large */
if( p_cache->small.p_stack[l_index].l_size < l_size ||
p_cache->small.p_stack[l_index].l_size > 2*l_size )
{
/* Checks whether the buffer cache is empty */
if( p_cache->large.l_index == 0 )
{
- /* Allocates a new packet */
+ /* Allocates a new packet */
if ( (p_data->p_buffer = malloc( l_size )) == NULL )
{
intf_ErrMsg( "Out of memory" );
free( p_data );
+ vlc_mutex_unlock( &p_cache->lock );
return NULL;
}
#ifdef TRACE_INPUT
{
intf_ErrMsg( "NULL packet in the small buffer cache" );
free( p_data );
+ vlc_mutex_unlock( &p_cache->lock );
return NULL;
}
- /* Reallocates the packet if it is too small or too large */
+ /* Reallocates the packet if it is too small or too large */
if( p_cache->large.p_stack[l_index].l_size < l_size ||
p_cache->large.p_stack[l_index].l_size > 2*l_size )
{
{
p_data->l_size = p_cache->large.p_stack[l_index].l_size;
}
- }
+ }
}
+ vlc_mutex_unlock( &p_cache->lock );
+
/* Initialize data */
p_data->p_next = NULL;
p_data->b_discard_payload = 0;
p_data->p_payload_end = p_data->p_buffer + l_size;
return( p_data );
-
+
}
}
#endif
+ vlc_mutex_lock( &p_cache->lock );
+
/* Checks whether the PES cache is empty */
if( p_cache->pes.l_index == 0 )
{
if ( (p_pes = malloc( sizeof(pes_packet_t) )) == NULL )
{
intf_DbgMsg( "Out of memory" );
+ vlc_mutex_unlock( &p_cache->lock );
return NULL;
}
#ifdef TRACE_INPUT
== NULL )
{
intf_ErrMsg( "NULL packet in the data cache" );
+ vlc_mutex_unlock( &p_cache->lock );
return NULL;
}
}
-
+
+ vlc_mutex_unlock( &p_cache->lock );
+
p_pes->b_data_alignment = p_pes->b_discontinuity =
p_pes->i_pts = p_pes->i_dts = 0;
p_pes->i_pes_size = 0;
}
#endif
- ASSERT( p_data );
+ ASSERT( p_data );
+
+ vlc_mutex_lock( &p_cache->lock );
/* Checks whether the data cache is full */
if ( p_cache->data.l_index < DATA_CACHE_SIZE )
#endif
}
}
- else
+ else
{
/* Checks whether the large buffer cache is full */
if ( p_cache->large.l_index < LARGE_CACHE_SIZE )
{
/* Cache full: the packet must be freed */
free( p_data->p_buffer );
- free( p_data );
+ free( p_data );
#ifdef TRACE_INPUT
intf_DbgMsg( "PS input: data packet freed" );
#endif
}
+ vlc_mutex_unlock( &p_cache->lock );
}
/*****************************************************************************
p_data = p_next;
}
+ vlc_mutex_lock( &p_cache->lock );
+
/* Checks whether the PES cache is full */
if ( p_cache->pes.l_index < PES_CACHE_SIZE )
{
- /* Cache not full: store the packet in it */
+ /* Cache not full: store the packet in it */
p_cache->pes.p_stack[ p_cache->pes.l_index ++ ] = p_pes;
}
else
intf_DbgMsg( "PS input: PES packet freed" );
#endif
}
+
+ vlc_mutex_unlock( &p_cache->lock );
}
projects / vlc / blobdiff