* input_programs.c: es_descriptor_t, pgrm_descriptor_t management
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_programs.c,v 1.19 2001/01/07 03:56:40 henri Exp $
+ * $Id: input_programs.c,v 1.26 2001/01/18 05:13:22 sam Exp $
*
* Authors:
*
#include "input_ext-intf.h"
#include "input_ext-dec.h"
#include "input.h"
-#include "input_dec.h"
#include "main.h" /* --noaudio --novideo */
*****************************************************************************/
void input_EndStream( input_thread_t * p_input )
{
- int i;
-
/* Free all programs and associated ES, and associated decoders. */
- for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
+ while( p_input->stream.i_pgrm_number )
{
- /* Don't put i instead of 0 !! */
input_DelProgram( p_input, p_input->stream.pp_programs[0] );
}
- free( p_input->stream.pp_programs );
/* Free standalone ES */
- for( i = 0; i < p_input->stream.i_es_number; i++ )
+ while( p_input->stream.i_es_number )
{
input_DelES( p_input, p_input->stream.pp_es[0] );
}
- free( p_input->stream.pp_es );
- free( p_input->stream.pp_selected_es );
}
/*****************************************************************************
if( p_input->stream.pp_programs == NULL )
{
intf_ErrMsg( "Unable to realloc memory in input_AddProgram" );
- return NULL;
+ return( NULL );
}
/* Allocate the structure to store this description */
if( p_input->stream.pp_programs[i_pgrm_index] == NULL )
{
intf_ErrMsg( "Unable to allocate memory in input_AddProgram" );
- return NULL;
+ return( NULL );
}
/* Init this entry */
if( p_input->stream.pp_programs[i_pgrm_index]->p_demux_data == NULL )
{
intf_ErrMsg( "Unable to allocate memory in input_AddProgram" );
- return NULL;
+ return( NULL );
}
memset( p_input->stream.pp_programs[i_pgrm_index]->p_demux_data, 0,
i_data_len );
*****************************************************************************/
void input_DelProgram( input_thread_t * p_input, pgrm_descriptor_t * p_pgrm )
{
- int i_index, i_pgrm_index;
+ int i_pgrm_index;
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] );
+ 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 )
{
/* 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.pp_programs == NULL)
+ if( p_input->stream.i_pgrm_number && p_input->stream.pp_programs == NULL)
{
- intf_ErrMsg( "Unable to realloc memory in input_DelProgram" );
+ intf_ErrMsg( "input error: unable to realloc program list"
+ " in input_DelProgram" );
}
+
/* Free the description of this program */
free( p_pgrm );
}
if( p_es == NULL )
{
intf_ErrMsg( "Unable to allocate memory in input_AddES" );
- return NULL;
+ return( NULL);
}
p_input->stream.i_es_number++;
p_input->stream.pp_es = realloc( p_input->stream.pp_es,
if( p_input->stream.pp_es == NULL )
{
intf_ErrMsg( "Unable to realloc memory in input_AddES" );
- return NULL;
+ return( NULL );
}
p_input->stream.pp_es[p_input->stream.i_es_number - 1] = p_es;
p_es->i_id = i_es_id;
if( p_es->p_demux_data == NULL )
{
intf_ErrMsg( "Unable to allocate memory in input_AddES" );
- return NULL;
+ return( NULL );
}
memset( p_es->p_demux_data, 0, i_data_len );
}
if( p_pgrm->pp_es == NULL )
{
intf_ErrMsg( "Unable to realloc memory in input_AddES" );
- return NULL;
+ return( NULL );
}
p_pgrm->pp_es[p_pgrm->i_es_number - 1] = p_es;
p_es->p_pgrm = p_pgrm;
/* Kill associated decoder, if any. */
if( p_es->p_decoder_fifo != NULL )
{
- input_EndDecoder( p_es->p_decoder_fifo, p_es->thread_id );
- free( p_es->p_decoder_fifo );
+ input_EndDecoder( p_input, p_es );
}
/* Remove this ES from the description of the program if it is associated to
p_pgrm->pp_es = realloc( p_pgrm->pp_es,
p_pgrm->i_es_number
* sizeof(es_descriptor_t *));
- if( p_pgrm->pp_es == NULL )
+ if( p_pgrm->i_es_number && p_pgrm->pp_es == NULL )
{
intf_ErrMsg( "Unable to realloc memory in input_DelES" );
}
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 )
+ if( p_input->stream.i_es_number && p_input->stream.pp_es == NULL )
{
intf_ErrMsg( "Unable to realloc memory in input_DelES" );
}
{
vdec_config_t * p_config;
- if( (p_config = (vdec_config_t *)malloc( sizeof(vdec_config_t) )) == NULL)
+ p_config = (vdec_config_t *)malloc( sizeof(vdec_config_t) );
+ if( p_config == NULL )
{
intf_ErrMsg( "Unable to allocate memory in GetVdecConfig" );
- return NULL;
+ 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;
- if ( (p_config = (adec_config_t *)malloc( sizeof(adec_config_t))) ==NULL )
+ p_config = (adec_config_t *)malloc( sizeof(adec_config_t));
+ if( p_config == NULL )
{
intf_ErrMsg( "Unable to allocate memory in GetAdecConfig" );
- return NULL;
+ 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 );
break;
}
+ if( p_es->thread_id == 0 )
+ {
+ return( -1 );
+ }
+
if( p_es->p_decoder_fifo != NULL )
{
p_input->stream.i_selected_es_number++;
projects / vlc / blobdiff