/*****************************************************************************
* input_programs.c: es_descriptor_t, pgrm_descriptor_t management
- * FIXME : check the return value of realloc() and malloc() !
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_programs.c,v 1.11 2000/12/21 13:54:15 massiot Exp $
+ * $Id: input_programs.c,v 1.26 2001/01/18 05:13:22 sam Exp $
*
* Authors:
*
void input_InitStream( input_thread_t * p_input, size_t i_data_len )
{
p_input->stream.i_stream_id = 0;
- p_input->stream.i_pgrm_number = 0;
+ p_input->stream.pp_es = NULL;
+ p_input->stream.pp_selected_es = NULL;
p_input->stream.pp_programs = NULL;
if( i_data_len )
{
- p_input->stream.p_demux_data = malloc( i_data_len );
+ if ( (p_input->stream.p_demux_data = malloc( i_data_len )) == NULL )
+ {
+ intf_ErrMsg( "Unable to allocate memory in input_InitStream");
+ /* FIXME : find a way to tell if failed */
+ return;
+ }
memset( p_input->stream.p_demux_data, 0, i_data_len );
}
}
+/*****************************************************************************
+ * input_EndStream: free all stream descriptors
+ *****************************************************************************/
+void input_EndStream( input_thread_t * p_input )
+{
+ /* Free all programs and associated ES, and associated decoders. */
+ while( p_input->stream.i_pgrm_number )
+ {
+ input_DelProgram( p_input, p_input->stream.pp_programs[0] );
+ }
+
+ /* Free standalone ES */
+ while( p_input->stream.i_es_number )
+ {
+ input_DelES( p_input, p_input->stream.pp_es[0] );
+ }
+}
+
+/*****************************************************************************
+ * input_FindProgram: returns a pointer to a program described by its ID
+ *****************************************************************************/
+pgrm_descriptor_t * input_FindProgram( input_thread_t * p_input, u16 i_pgrm_id )
+{
+ int i;
+
+ for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
+ {
+ if( p_input->stream.pp_programs[i]->i_number == i_pgrm_id )
+ {
+ return p_input->stream.pp_programs[i];
+ }
+ }
+
+ return( NULL );
+}
+
/*****************************************************************************
* input_AddProgram: add and init a program descriptor
*****************************************************************************
p_input->stream.pp_programs = realloc( p_input->stream.pp_programs,
p_input->stream.i_pgrm_number
* sizeof(pgrm_descriptor_t *) );
-
+ if( p_input->stream.pp_programs == NULL )
+ {
+ intf_ErrMsg( "Unable to realloc memory in input_AddProgram" );
+ return( NULL );
+ }
+
/* Allocate the structure to store this description */
p_input->stream.pp_programs[i_pgrm_index] =
malloc( sizeof(pgrm_descriptor_t) );
-
+ if( p_input->stream.pp_programs[i_pgrm_index] == NULL )
+ {
+ intf_ErrMsg( "Unable to allocate memory in input_AddProgram" );
+ return( NULL );
+ }
+
/* Init this entry */
p_input->stream.pp_programs[i_pgrm_index]->i_number = i_pgrm_id;
p_input->stream.pp_programs[i_pgrm_index]->b_is_ok = 0;
{
p_input->stream.pp_programs[i_pgrm_index]->p_demux_data =
malloc( i_data_len );
+ if( p_input->stream.pp_programs[i_pgrm_index]->p_demux_data == NULL )
+ {
+ intf_ErrMsg( "Unable to allocate memory in input_AddProgram" );
+ return( NULL );
+ }
memset( p_input->stream.pp_programs[i_pgrm_index]->p_demux_data, 0,
i_data_len );
}
*****************************************************************************
* All ES descriptions referenced in the descriptor will be deleted.
*****************************************************************************/
-void input_DelProgram( input_thread_t * p_input, u16 i_pgrm_id )
+void input_DelProgram( input_thread_t * p_input, pgrm_descriptor_t * p_pgrm )
{
- int i_index, i_pgrm_index = -1;
- pgrm_descriptor_t * p_pgrm = NULL;
-
- intf_DbgMsg("Deleting description for pgrm %d", i_pgrm_id);
+ int i_pgrm_index;
- /* Find where this program is described */
- for( i_index = 0; i_index < p_input->stream.i_pgrm_number; i_index++ )
- {
- if( p_input->stream.pp_programs[i_index]->i_number == i_pgrm_id )
- {
- i_pgrm_index = i_index;
- p_pgrm = p_input->stream.pp_programs[ i_pgrm_index ];
- break;
- }
- }
+ ASSERT( p_pgrm );
- /* Make sure that the pgrm exists */
- ASSERT(i_pgrm_index >= 0);
- ASSERT(p_pgrm);
+ intf_DbgMsg("Deleting description for pgrm %d", p_pgrm->i_number);
/* Free the structures that describe the es that belongs to that program */
- for( i_index = 0; i_index < p_pgrm->i_es_number; i_index++ )
+ while( p_pgrm->i_es_number )
{
- input_DelES( p_input, p_pgrm->pp_es[i_index]->i_id );
+ input_DelES( p_input, p_pgrm->pp_es[0] );
}
- /* Free the table of es descriptors */
- free( p_pgrm->pp_es );
-
/* Free the demux data */
if( p_pgrm->p_demux_data != NULL )
{
free( p_pgrm->p_demux_data );
}
- /* Free the description of this stream */
- free( p_pgrm );
+ /* Find the program in the programs table */
+ for( i_pgrm_index = 0; i_pgrm_index < p_input->stream.i_pgrm_number;
+ i_pgrm_index++ )
+ {
+ if( p_input->stream.pp_programs[i_pgrm_index] == p_pgrm )
+ break;
+ }
/* Remove this program from the stream's list of programs */
p_input->stream.i_pgrm_number--;
+
p_input->stream.pp_programs[i_pgrm_index] =
p_input->stream.pp_programs[p_input->stream.i_pgrm_number];
p_input->stream.pp_programs = realloc( p_input->stream.pp_programs,
p_input->stream.i_pgrm_number
* sizeof(pgrm_descriptor_t *) );
+
+ if( p_input->stream.i_pgrm_number && p_input->stream.pp_programs == NULL)
+ {
+ intf_ErrMsg( "input error: unable to realloc program list"
+ " in input_DelProgram" );
+ }
+
+ /* Free the description of this program */
+ free( p_pgrm );
+}
+
+/*****************************************************************************
+ * input_FindES: returns a pointer to an ES described by its ID
+ *****************************************************************************/
+es_descriptor_t * input_FindES( input_thread_t * p_input, u16 i_es_id )
+{
+ int i;
+
+ for( i = 0; i < p_input->stream.i_es_number; i++ )
+ {
+ if( p_input->stream.pp_es[i]->i_id == i_es_id )
+ {
+ return p_input->stream.pp_es[i];
+ }
+ }
+
+ return( NULL );
}
/*****************************************************************************
{
es_descriptor_t * p_es;
- intf_DbgMsg("Adding description for ES %d", i_es_id);
+ intf_DbgMsg("Adding description for ES 0x%x", i_es_id);
p_es = (es_descriptor_t *)malloc( sizeof(es_descriptor_t) );
- p_input->i_es_number++;
- p_input->pp_es = realloc( p_input->pp_es, p_input->i_es_number
- * sizeof(es_descriptor_t *) );
- p_input->pp_es[p_input->i_es_number - 1] = p_es;
+ if( p_es == NULL )
+ {
+ intf_ErrMsg( "Unable to allocate memory in input_AddES" );
+ return( NULL);
+ }
+ p_input->stream.i_es_number++;
+ p_input->stream.pp_es = realloc( p_input->stream.pp_es,
+ p_input->stream.i_es_number
+ * sizeof(es_descriptor_t *) );
+ if( p_input->stream.pp_es == NULL )
+ {
+ intf_ErrMsg( "Unable to realloc memory in input_AddES" );
+ return( NULL );
+ }
+ p_input->stream.pp_es[p_input->stream.i_es_number - 1] = p_es;
p_es->i_id = i_es_id;
/* Init its values */
if( i_data_len )
{
p_es->p_demux_data = malloc( i_data_len );
+ if( p_es->p_demux_data == NULL )
+ {
+ intf_ErrMsg( "Unable to allocate memory in input_AddES" );
+ return( NULL );
+ }
memset( p_es->p_demux_data, 0, i_data_len );
}
+ else
+ {
+ p_es->p_demux_data = NULL;
+ }
/* Add this ES to the program definition if one is given */
if( p_pgrm )
p_pgrm->pp_es = realloc( p_pgrm->pp_es,
p_pgrm->i_es_number
* sizeof(es_descriptor_t *) );
+ if( p_pgrm->pp_es == NULL )
+ {
+ intf_ErrMsg( "Unable to realloc memory in input_AddES" );
+ return( NULL );
+ }
p_pgrm->pp_es[p_pgrm->i_es_number - 1] = p_es;
p_es->p_pgrm = p_pgrm;
}
/*****************************************************************************
* input_DelES:
*****************************************************************************/
-void input_DelES( input_thread_t * p_input, u16 i_id )
+void input_DelES( input_thread_t * p_input, es_descriptor_t * p_es )
{
- int i_index, i_es;
- pgrm_descriptor_t * p_pgrm = NULL;
- es_descriptor_t * p_es = NULL;
+ int i_index, i_es_index;
+ pgrm_descriptor_t * p_pgrm;
+
+ ASSERT( p_es );
+ p_pgrm = p_es->p_pgrm;
- /* Look for the description of the ES */
- for( i_es = 0; i_es < p_input->i_es_number; i_es++ )
+ /* Kill associated decoder, if any. */
+ if( p_es->p_decoder_fifo != NULL )
{
- if( p_input->pp_es[i_es]->i_id == i_id )
- {
- p_es = p_input->pp_es[i_es];
- p_pgrm = p_input->pp_es[i_es]->p_pgrm;
- break;
- }
+ input_EndDecoder( p_input, p_es );
}
- ASSERT( p_es );
-
/* Remove this ES from the description of the program if it is associated to
* one */
if( p_pgrm )
{
- for( i_index = 0; ; i_index++ )
+ for( i_index = 0; i_index < p_pgrm->i_es_number; i_index++ )
{
- if( p_pgrm->pp_es[i_index]->i_id == i_id )
+ if( p_pgrm->pp_es[i_index] == p_es )
{
p_pgrm->i_es_number--;
p_pgrm->pp_es[i_index] = p_pgrm->pp_es[p_pgrm->i_es_number];
p_pgrm->pp_es = realloc( p_pgrm->pp_es,
p_pgrm->i_es_number
* sizeof(es_descriptor_t *));
+ if( p_pgrm->i_es_number && p_pgrm->pp_es == NULL )
+ {
+ intf_ErrMsg( "Unable to realloc memory in input_DelES" );
+ }
break;
}
}
free( p_es->p_demux_data );
}
+ /* Find the ES in the ES table */
+ for( i_es_index = 0; i_es_index < p_input->stream.i_es_number;
+ i_es_index++ )
+ {
+ if( p_input->stream.pp_es[i_es_index] == p_es )
+ break;
+ }
+
/* Free the ES */
free( p_es );
- p_input->i_es_number--;
- p_input->pp_es[i_es] = p_input->pp_es[p_input->i_es_number];
- p_input->pp_es = realloc( p_input->pp_es, p_input->i_es_number
- * sizeof(es_descriptor_t *));
+ p_input->stream.i_es_number--;
+ p_input->stream.pp_es[i_es_index] =
+ p_input->stream.pp_es[p_input->stream.i_es_number];
+ p_input->stream.pp_es = realloc( p_input->stream.pp_es,
+ p_input->stream.i_es_number
+ * sizeof(es_descriptor_t *));
+ if( p_input->stream.i_es_number && p_input->stream.pp_es == NULL )
+ {
+ intf_ErrMsg( "Unable to realloc memory in input_DelES" );
+ }
+
}
#ifdef STATS
{
int i, j;
#define S p_input->stream
- intf_Msg( "input info: Dumping stream ID 0x%x\n", S.i_stream_id );
+ intf_Msg( "input info: Dumping stream ID 0x%x", S.i_stream_id );
if( S.b_seekable )
- intf_Msg( "input info: seekable stream, position: %d/%d\n",
+ intf_Msg( "input info: seekable stream, position: %d/%d",
S.i_tell, S.i_size );
else
- intf_Msg( "input info: %s\n", S.b_pace_control ? "pace controlled" :
+ intf_Msg( "input info: %s", S.b_pace_control ? "pace controlled" :
"pace un-controlled" );
#undef S
for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
{
#define P p_input->stream.pp_programs[i]
- intf_Msg( "input info: Dumping program 0x%x, version %d (%s)\n",
+ intf_Msg( "input info: Dumping program 0x%x, version %d (%s)",
P->i_number, P->i_version,
P->b_is_ok ? "complete" : "partial" );
if( P->i_synchro_state == SYNCHRO_OK )
- intf_Msg( "input info: synchro absolute delta : %lld (jitter : %lld)\n",
+ intf_Msg( "input info: synchro absolute delta : %lld (jitter : %lld)",
P->delta_absolute, P->delta_cr );
#undef P
for( j = 0; j < p_input->stream.pp_programs[i]->i_es_number; j++ )
{
#define ES p_input->stream.pp_programs[i]->pp_es[j]
- intf_Msg( "input info: ES 0x%x, stream 0x%x, type 0x%x, %s\n",
+ intf_Msg( "input info: ES 0x%x, stream 0x%x, type 0x%x, %s",
ES->i_id, ES->i_stream_id, ES->i_type,
ES->p_decoder_fifo != NULL ? "selected" : "not selected");
#undef ES
static int InitDecConfig( input_thread_t * p_input, es_descriptor_t * p_es,
decoder_config_t * p_config )
{
- p_config->i_stream_id = p_es->i_stream_id;
+ p_config->i_id = p_es->i_id;
p_config->i_type = p_es->i_type;
p_config->p_stream_ctrl =
&p_input->stream.control;
vdec_config_t * p_config;
p_config = (vdec_config_t *)malloc( sizeof(vdec_config_t) );
+ if( p_config == NULL )
+ {
+ intf_ErrMsg( "Unable to allocate memory in GetVdecConfig" );
+ return( NULL );
+ }
p_config->p_vout = p_input->p_default_vout;
if( InitDecConfig( p_input, p_es, &p_config->decoder_config ) == -1 )
{
free( p_config );
- return NULL;
+ return( NULL );
}
return( p_config );
{
adec_config_t * p_config;
- p_config = (adec_config_t *)malloc( sizeof(adec_config_t) );
+ p_config = (adec_config_t *)malloc( sizeof(adec_config_t));
+ if( p_config == NULL )
+ {
+ intf_ErrMsg( "Unable to allocate memory in GetAdecConfig" );
+ return( NULL );
+ }
p_config->p_aout = p_input->p_default_aout;
if( InitDecConfig( p_input, p_es, &p_config->decoder_config ) == -1 )
{
free( p_config );
- return NULL;
+ return( NULL );
}
return( p_config );
/*****************************************************************************
* input_SelectES: selects an ES and spawns the associated decoder
*****************************************************************************/
+/* FIXME */
+vlc_thread_t adec_CreateThread( void * );
+vlc_thread_t ac3dec_CreateThread( void * );
+vlc_thread_t vpar_CreateThread( void * );
+vlc_thread_t spudec_CreateThread( void * );
+
int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
{
- int i;
+ /* FIXME ! */
+ decoder_capabilities_t decoder;
#ifdef DEBUG_INPUT
- intf_DbgMsg( "Selecting ES %d", p_es->i_id );
+ intf_DbgMsg( "Selecting ES 0x%x", p_es->i_id );
#endif
if( p_es->p_decoder_fifo != NULL )
case MPEG2_AUDIO_ES:
if( p_main->b_audio )
{
- p_es->thread_id = adec_CreateThread( GetAdecConfig( p_input,
- p_es ) );
+ decoder.pf_create_thread = adec_CreateThread;
+ p_es->thread_id = input_RunDecoder( &decoder,
+ (void *)GetAdecConfig( p_input, p_es ) );
}
break;
case MPEG2_VIDEO_ES:
if( p_main->b_video )
{
- p_es->thread_id = vpar_CreateThread( GetVdecConfig( p_input,
- p_es ) );
+ decoder.pf_create_thread = vpar_CreateThread;
+ p_es->thread_id = input_RunDecoder( &decoder,
+ (void *)GetVdecConfig( p_input, p_es ) );
}
break;
case AC3_AUDIO_ES:
if( p_main->b_audio )
{
- p_es->thread_id = ac3dec_CreateThread( GetAdecConfig( p_input,
- p_es ) );
+ decoder.pf_create_thread = ac3dec_CreateThread;
+ p_es->thread_id = input_RunDecoder( &decoder,
+ (void *)GetAdecConfig( p_input, p_es ) );
}
break;
case DVD_SPU_ES:
if( p_main->b_video )
{
- p_es->thread_id = spudec_CreateThread( GetVdecConfig( p_input,
- p_es ) );
+ decoder.pf_create_thread = spudec_CreateThread;
+ p_es->thread_id = input_RunDecoder( &decoder,
+ (void *)GetVdecConfig( p_input, p_es ) );
}
break;
break;
}
+ if( p_es->thread_id == 0 )
+ {
+ return( -1 );
+ }
+
if( p_es->p_decoder_fifo != NULL )
{
- p_input->i_selected_es_number++;
- p_input->pp_selected_es = realloc( p_input->pp_selected_es,
- p_input->i_selected_es_number
+ p_input->stream.i_selected_es_number++;
+ p_input->stream.pp_selected_es = realloc(
+ p_input->stream.pp_selected_es,
+ p_input->stream.i_selected_es_number
* sizeof(es_descriptor_t *) );
- p_input->pp_selected_es[p_input->i_selected_es_number - 1] = p_es;
+ if( p_input->stream.pp_selected_es == NULL )
+ {
+ intf_ErrMsg( "Unable to realloc memory in input_SelectES" );
+ return(-1);
+ }
+ p_input->stream.pp_selected_es[p_input->stream.i_selected_es_number - 1]
+ = p_es;
}
return( 0 );
}
projects / vlc / blobdiff