/*****************************************************************************
* input_programs.c: es_descriptor_t, pgrm_descriptor_t management
*****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
- * $Id: input_programs.c,v 1.68 2001/12/07 16:47:47 jobi Exp $
+ * Copyright (C) 1999-2002 VideoLAN
+ * $Id: input_programs.c,v 1.94 2002/07/31 20:56:52 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include "defs.h"
-
#include <stdlib.h>
#include <string.h> /* memcpy(), memset() */
#include <sys/types.h> /* off_t */
-#include "config.h"
-#include "common.h"
-#include "intf_msg.h"
-#include "threads.h"
-#include "mtime.h"
-#include "debug.h"
+#include <vlc/vlc.h>
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
#include "input_ext-plugins.h"
-#include "main.h" /* --noaudio --novideo */
-
/*
* NOTICE : all of these functions expect you to have taken the lock on
* p_input->stream.lock
{
if ( (p_input->stream.p_demux_data = malloc( i_data_len )) == NULL )
{
- intf_ErrMsg( "Unable to allocate memory in input_InitStream");
+ msg_Err( p_input, "out of memory" );
return 1;
}
memset( p_input->stream.p_demux_data, 0, i_data_len );
}
}
- return( NULL );
+ return NULL;
}
/*****************************************************************************
/* Where to add the pgrm */
int i_pgrm_index = p_input->stream.i_pgrm_number;
- intf_DbgMsg("Adding description for pgrm %d", i_pgrm_id);
-
/* Add an entry to the list of program associated with the stream */
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 *) );
+ * sizeof(pgrm_descriptor_t *) );
if( p_input->stream.pp_programs == NULL )
{
- intf_ErrMsg( "Unable to realloc memory in input_AddProgram" );
+ msg_Err( p_input, "out of memory" );
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" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
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" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
memset( p_input->stream.pp_programs[i_pgrm_index]->p_demux_data, 0,
{
int i_pgrm_index;
- ASSERT( 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;
+ }
- intf_DbgMsg("Deleting description for pgrm %d", p_pgrm->i_number);
+ /* If the program wasn't found, do nothing */
+ if( i_pgrm_index == p_input->stream.i_pgrm_number )
+ {
+ msg_Err( p_input, "program does not belong to this input" );
+ return;
+ }
/* Free the structures that describe the es that belongs to that program */
while( p_pgrm->i_es_number )
free( p_pgrm->p_demux_data );
}
- /* 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)
+ if( p_input->stream.i_pgrm_number )
{
- intf_ErrMsg( "input error: unable to realloc program list"
- " in input_DelProgram" );
+ 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 )
+ {
+ msg_Err( p_input, "cannot realloc memory" );
+ }
+ }
+ else
+ {
+ free( p_input->stream.pp_programs );
+ p_input->stream.pp_programs = NULL;
}
/* Free the description of this program */
/* Where to add the pgrm */
int i_area_index = p_input->stream.i_area_nb;
- intf_DbgMsg("Adding description for area %d", i_area_index );
-
/* Add an entry to the list of program associated with the stream */
p_input->stream.i_area_nb++;
p_input->stream.pp_areas = realloc( p_input->stream.pp_areas,
p_input->stream.i_area_nb
- * sizeof(input_area_t *) );
+ * sizeof(input_area_t *) );
if( p_input->stream.pp_areas == NULL )
{
- intf_ErrMsg( "Unable to realloc memory in input_AddArea" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
-
+
/* Allocate the structure to store this description */
p_input->stream.pp_areas[i_area_index] =
malloc( sizeof(input_area_t) );
if( p_input->stream.pp_areas[i_area_index] == NULL )
{
- intf_ErrMsg( "Unable to allocate memory in input_AddArea" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
p_input->stream.pp_areas[i_area_index]->i_seek = NO_SEEK;
p_input->stream.pp_areas[i_area_index]->i_part_nb = 1;
p_input->stream.pp_areas[i_area_index]->i_part= 0;
- p_input->stream.pp_areas[i_area_index]->i_angle_nb = 1;
- p_input->stream.pp_areas[i_area_index]->i_angle = 0;
return p_input->stream.pp_areas[i_area_index];
}
int input_SetProgram( input_thread_t * p_input, pgrm_descriptor_t * p_new_prg )
{
int i_es_index;
-#define old_prg p_input->stream.p_selected_program
- for ( i_es_index = 0 ; i_es_index < old_prg->i_es_number ; i_es_index ++ )
+ int i_required_audio_es;
+ int i_required_spu_es;
+ int i_audio_es = 0;
+ int i_spu_es = 0;
+
+ if ( p_input->stream.p_selected_program )
+ {
+ for ( i_es_index = 1 ; /* 0 should be the PMT */
+ i_es_index < p_input->stream.p_selected_program->
+ i_es_number ;
+ i_es_index ++ )
+ {
+#define p_es p_input->stream.p_selected_program->pp_es[i_es_index]
+ if ( p_es->p_decoder_fifo ) /* if the ES was selected */
+ {
+ input_UnselectES( p_input , p_es );
+ }
+#undef p_es
+ }
+ }
+ /* Get the number of the required audio stream */
+ if( config_GetInt( p_input, "audio" ) )
+ {
+ /* Default is the first one */
+ i_required_audio_es = config_GetInt( p_input, "audio-channel" );
+ if( i_required_audio_es < 0 )
+ {
+ i_required_audio_es = 1;
+ }
+ }
+ else
+ {
+ i_required_audio_es = 0;
+ }
+
+ /* Same thing for subtitles */
+ if( config_GetInt( p_input, "video" ) )
{
- input_UnselectES( p_input , old_prg->pp_es[i_es_index] );
+ /* for spu, default is none */
+ i_required_spu_es = config_GetInt( p_input, "spu-channel" );
+ if( i_required_spu_es < 0 )
+ {
+ i_required_spu_es = 0;
+ }
}
-#undef old_prg
- for (i_es_index = 0 ; i_es_index < p_new_prg->i_es_number ; i_es_index ++ )
+ else
{
- input_SelectES( p_input , p_new_prg->pp_es[i_es_index] );
+ i_required_spu_es = 0;
}
+ for( i_es_index = 0 ; i_es_index < p_new_prg->i_es_number ; i_es_index ++ )
+ {
+ switch( p_new_prg->pp_es[i_es_index]->i_cat )
+ {
+ case VIDEO_ES:
+ msg_Dbg( p_input, "selecting ES %x",
+ p_new_prg->pp_es[i_es_index]->i_id );
+ input_SelectES( p_input, p_new_prg->pp_es[i_es_index] );
+ break;
+ case AUDIO_ES:
+ i_audio_es += 1;
+ if( i_audio_es <= i_required_audio_es )
+ {
+ msg_Dbg( p_input, "selecting ES %x",
+ p_new_prg->pp_es[i_es_index]->i_id );
+ input_SelectES( p_input, p_new_prg->pp_es[i_es_index]);
+ }
+ break;
+ /* Not sure this one is fully specification-compliant */
+ case SPU_ES :
+ i_spu_es += 1;
+ if( i_spu_es <= i_required_spu_es )
+ {
+ msg_Dbg( p_input, "selecting ES %x",
+ p_new_prg->pp_es[i_es_index]->i_id );
+ input_SelectES( p_input, p_new_prg->pp_es[i_es_index] );
+ }
+ break;
+ default :
+ msg_Dbg( p_input, "ES %x has unknown type",
+ p_new_prg->pp_es[i_es_index]->i_id );
+ break;
+ }
+
+ }
+
+
p_input->stream.p_selected_program = p_new_prg;
return( 0 );
{
int i_area_index;
- ASSERT( p_area );
-
- intf_DbgMsg("Deleting description for area %d", p_area->i_id );
-
/* Find the area in the areas table */
for( i_area_index = 0; i_area_index < p_input->stream.i_area_nb;
i_area_index++ )
break;
}
+ /* If the area wasn't found, do nothing */
+ if( i_area_index == p_input->stream.i_area_nb )
+ {
+ msg_Err( p_input, "area does not belong to this input" );
+ return;
+ }
+
/* Remove this area from the stream's list of areas */
p_input->stream.i_area_nb--;
p_input->stream.pp_areas[i_area_index] =
p_input->stream.pp_areas[p_input->stream.i_area_nb];
- p_input->stream.pp_areas = realloc( p_input->stream.pp_areas,
- p_input->stream.i_area_nb
+ if( p_input->stream.i_area_nb )
+ {
+ p_input->stream.pp_areas = realloc( p_input->stream.pp_areas,
+ p_input->stream.i_area_nb
* sizeof(input_area_t *) );
- if( p_input->stream.i_area_nb && p_input->stream.pp_areas == NULL)
+ if( p_input->stream.pp_areas == NULL )
+ {
+ msg_Err( p_input, "cannot realloc memory" );
+ }
+ }
+ else
{
- intf_ErrMsg( "input error: unable to realloc area list"
- " in input_DelArea" );
+ free( p_input->stream.pp_areas );
+ p_input->stream.pp_areas = NULL;
}
/* Free the description of this area */
}
}
- return( NULL );
+ return NULL;
}
/*****************************************************************************
{
es_descriptor_t * p_es;
- intf_DbgMsg("Adding description for ES 0x%x", i_es_id);
-
p_es = (es_descriptor_t *)malloc( sizeof(es_descriptor_t) );
if( p_es == NULL )
{
- intf_ErrMsg( "Unable to allocate memory in input_AddES" );
+ msg_Err( p_input, "out of memory" );
return( NULL);
}
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" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
+
p_input->stream.pp_es[p_input->stream.i_es_number - 1] = p_es;
/* Init its values */
p_es->psz_desc[0] = '\0';
p_es->p_pes = NULL;
p_es->p_decoder_fifo = NULL;
- p_es->b_audio = 0;
p_es->i_cat = UNKNOWN_ES;
+ p_es->i_demux_fd = 0;
+ p_es->c_packets = 0;
+ p_es->c_invalid_packets = 0;
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" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
memset( p_es->p_demux_data, 0, i_data_len );
* sizeof(es_descriptor_t *) );
if( p_pgrm->pp_es == NULL )
{
- intf_ErrMsg( "Unable to realloc memory in input_AddES" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
+
p_pgrm->pp_es[p_pgrm->i_es_number - 1] = p_es;
p_es->p_pgrm = p_pgrm;
}
int i_index, i_es_index;
pgrm_descriptor_t * p_pgrm;
- ASSERT( p_es );
+ /* 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;
+ }
+
+ /* If the ES wasn't found, do nothing */
+ if( i_es_index == p_input->stream.i_es_number )
+ {
+ msg_Err( p_input, "ES does not belong to this input" );
+ return;
+ }
+
p_pgrm = p_es->p_pgrm;
/* Kill associated decoder, if any. */
{
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 )
+ if( p_pgrm->i_es_number )
{
- intf_ErrMsg( "Unable to realloc memory in input_DelES" );
+ p_pgrm->pp_es = realloc( p_pgrm->pp_es,
+ p_pgrm->i_es_number
+ * sizeof(es_descriptor_t *));
+ if( p_pgrm->pp_es == NULL )
+ {
+ msg_Err( p_input, "cannot realloc memory" );
+ }
+ }
+ else
+ {
+ free( p_pgrm->pp_es );
+ p_pgrm->pp_es = NULL;
}
break;
}
break;
}
- /* Free the ES */
- free( p_es );
+ /* Remove this ES from the stream's list of ES */
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 )
+ if( 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 )
+ {
+ msg_Err( p_input, "cannot realloc memory" );
+ }
+ }
+ else
{
- intf_ErrMsg( "Unable to realloc memory in input_DelES" );
+ free( p_input->stream.pp_es );
+ p_input->stream.pp_es = NULL;
}
+ /* Free the ES */
+ free( p_es );
}
/*****************************************************************************
{
if( p_es == NULL )
{
- intf_ErrMsg( "Nothing to do in input_SelectES" );
+ msg_Err( p_input, "nothing to do in input_SelectES" );
return -1;
}
-#ifdef TRACE_INPUT
- intf_DbgMsg( "Selecting ES 0x%x", p_es->i_id );
-#endif
+ msg_Dbg( p_input, "selecting ES 0x%x", p_es->i_id );
if( p_es->p_decoder_fifo != NULL )
{
- intf_ErrMsg( "ES 0x%x is already selected", p_es->i_id );
- return( -1 );
+ msg_Err( p_input, "ES 0x%x is already selected", p_es->i_id );
+ return -1;
}
- switch( p_es->i_type )
- {
- case AC3_AUDIO_ES:
- case MPEG1_AUDIO_ES:
- case MPEG2_AUDIO_ES:
- case LPCM_AUDIO_ES:
- if( p_main->b_audio )
- {
- /* This kludge should be removed */
- p_main->b_ac3 = ( p_es->i_type == AC3_AUDIO_ES );
-
- /* Release the lock, not to block the input thread during
- * the creation of the thread. */
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- p_es->thread_id = input_RunDecoder( p_input, p_es );
- vlc_mutex_lock( &p_input->stream.stream_lock );
- }
- break;
-
- case MPEG1_VIDEO_ES:
- case MPEG2_VIDEO_ES:
- case DVD_SPU_ES:
- if( p_main->b_video )
- {
- /* Release the lock, not to block the input thread during
- * the creation of the thread. */
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- p_es->thread_id = input_RunDecoder( p_input, p_es );
- vlc_mutex_lock( &p_input->stream.stream_lock );
- }
- break;
-
- default:
- intf_ErrMsg( "Unknown stream type 0x%x", p_es->i_type );
- return( -1 );
- break;
- }
+ /* Release the lock, not to block the input thread during
+ * the creation of the thread. */
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ p_es->p_decoder_fifo = input_RunDecoder( p_input, p_es );
+ vlc_mutex_lock( &p_input->stream.stream_lock );
- if( p_es->thread_id == 0 )
+ if( p_es->p_decoder_fifo == NULL )
{
- return( -1 );
+ return -1;
}
- return( 0 );
+ return 0;
}
/*****************************************************************************
if( p_es == NULL )
{
- intf_ErrMsg( "Nothing to do in input_UnselectES" );
+ msg_Err( p_input, "nothing to do in input_UnselectES" );
return -1;
}
-#ifdef TRACE_INPUT
- intf_DbgMsg( "Unselecting ES 0x%x", p_es->i_id );
-#endif
+ msg_Dbg( p_input, "unselecting ES 0x%x", p_es->i_id );
if( p_es->p_decoder_fifo == NULL )
{
- intf_ErrMsg( "ES 0x%x is not selected", p_es->i_id );
+ msg_Err( p_input, "ES 0x%x is not selected", p_es->i_id );
return( -1 );
}
input_EndDecoder( p_input, p_es );
+ p_es->p_pes = NULL;
if( ( p_es->p_decoder_fifo == NULL ) &&
( p_input->stream.i_selected_es_number > 0 ) )
p_input->stream.pp_selected_es[i_index] =
p_input->stream.pp_selected_es[p_input->stream.i_selected_es_number];
- p_input->stream.pp_selected_es = realloc(
+ if( 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 *) );
-
- if( p_input->stream.pp_selected_es == NULL )
+ * sizeof(es_descriptor_t *) );
+ if( p_input->stream.pp_selected_es == NULL )
+ {
+ msg_Err( p_input, "cannot realloc memory" );
+ return( -1 );
+ }
+ }
+ else
{
-#ifdef TRACE_INPUT
- intf_DbgMsg( "No more selected ES in input_UnselectES" );
-#endif
+ free( p_input->stream.pp_selected_es );
+ p_input->stream.pp_selected_es = NULL;
+ msg_Dbg( p_input, "no more selected ES" );
return( 1 );
}
}
projects / vlc / blobdiff