* input_programs.c: es_descriptor_t, pgrm_descriptor_t management
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_programs.c,v 1.36 2001/02/22 17:00:20 massiot Exp $
+ * $Id: input_programs.c,v 1.54 2001/05/01 04:18:18 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
#include "defs.h"
#include <stdlib.h>
+#include <string.h> /* memcpy(), memset() */
+#include <sys/types.h> /* off_t */
#include "config.h"
#include "common.h"
*****************************************************************************/
int input_InitStream( input_thread_t * p_input, size_t i_data_len )
{
+
+ p_input->stream.i_method = INPUT_METHOD_NONE;
p_input->stream.i_stream_id = 0;
+
+ /* initialized to 0 since we don't give the signal to the interface
+ * before the end of input initialization */
+ p_input->stream.b_changed = 0;
p_input->stream.pp_es = NULL;
p_input->stream.pp_selected_es = NULL;
p_input->stream.pp_programs = NULL;
{
input_DelES( p_input, p_input->stream.pp_es[0] );
}
+
+ /* Free all areas */
+ while( p_input->stream.i_area_nb )
+ {
+ input_DelArea( p_input, p_input->stream.pp_areas[0] );
+ }
+
+ if( p_input->stream.p_demux_data != NULL )
+ {
+ free( p_input->stream.p_demux_data );
+ }
}
/*****************************************************************************
p_input->stream.pp_programs[i_pgrm_index]->p_vout
= p_input->p_default_vout;
- p_input->stream.pp_programs[i_pgrm_index]->p_aout
- = p_input->p_default_aout;
if( i_data_len )
{
p_input->stream.pp_areas[i_area_index]->i_size = 0;
p_input->stream.pp_areas[i_area_index]->i_tell = 0;
p_input->stream.pp_areas[i_area_index]->i_seek = NO_SEEK;
- p_input->stream.pp_areas[i_area_index]->i_part_nb = 0;
+ 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];
}
ASSERT( p_area );
- intf_DbgMsg("Deleting description for area %d", p_area->i_nb );
+ 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;
/* Init its values */
p_es->i_id = i_es_id;
+ 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;
if( i_data_len )
{
p_config->pf_init_bit_stream = InitBitstream;
+ 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 )
+ {
+ 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 );
}
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 );
/*****************************************************************************
* input_SelectES: selects an ES and spawns the associated decoder
+ *****************************************************************************
+ * Remember we are still supposed to have stream_lock when entering this
+ * function ?
*****************************************************************************/
/* FIXME */
vlc_thread_t adec_CreateThread( void * );
vlc_thread_t ac3dec_CreateThread( void * );
+vlc_thread_t ac3spdif_CreateThread( void * );
+vlc_thread_t spdif_CreateThread( void * );
vlc_thread_t vpar_CreateThread( void * );
vlc_thread_t spudec_CreateThread( void * );
{
/* FIXME ! */
decoder_capabilities_t decoder;
+ void * p_config;
-#ifdef DEBUG_INPUT
+ if( p_es == NULL )
+ {
+ intf_ErrMsg( "Nothing to do in input_SelectES" );
+ return -1;
+ }
+
+#ifdef TRACE_INPUT
intf_DbgMsg( "Selecting ES 0x%x", p_es->i_id );
#endif
if( p_es->p_decoder_fifo != NULL )
{
- intf_ErrMsg( "ES %d is already selected", p_es->i_id );
+ intf_ErrMsg( "ES 0x%x is already selected", p_es->i_id );
return( -1 );
}
if( p_main->b_audio )
{
decoder.pf_create_thread = adec_CreateThread;
- p_es->thread_id = input_RunDecoder( &decoder,
- (void *)GetAdecConfig( p_input, p_es ) );
+ p_config = (void *)GetAdecConfig( p_input, p_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( &decoder, p_config );
+ vlc_mutex_lock( &p_input->stream.stream_lock );
}
break;
if( p_main->b_video )
{
decoder.pf_create_thread = vpar_CreateThread;
- p_es->thread_id = input_RunDecoder( &decoder,
- (void *)GetVdecConfig( p_input, p_es ) );
+ p_config = (void *)GetVdecConfig( p_input, p_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( &decoder, p_config );
+ vlc_mutex_lock( &p_input->stream.stream_lock );
}
break;
case AC3_AUDIO_ES:
if( p_main->b_audio )
{
- decoder.pf_create_thread = ac3dec_CreateThread;
- p_es->thread_id = input_RunDecoder( &decoder,
- (void *)GetAdecConfig( p_input, p_es ) );
+ if( main_GetIntVariable( AOUT_SPDIF_VAR, 0 ) )
+ {
+ decoder.pf_create_thread = spdif_CreateThread;
+ }
+ else
+ {
+ decoder.pf_create_thread = ac3dec_CreateThread;
+ }
+
+ p_config = (void *)GetAdecConfig( p_input, p_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( &decoder, p_config );
+ vlc_mutex_lock( &p_input->stream.stream_lock );
}
break;
+#if 0
+ case LPCM_AUDIO_ES:
+ if( p_main->b_audio )
+ {
+ if( p_main->b_spdif )
+ {
+ decoder.pf_create_thread = spdif_CreateThread;
+ }
+ else
+ {
+ intf_ErrMsg( "input error: LPCM audio not handled yet" );
+ break;
+ }
+
+ p_config = (void *)GetAdecConfig( p_input, p_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( &decoder, p_config );
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ }
+ break;
+#endif
case DVD_SPU_ES:
if( p_main->b_video )
{
decoder.pf_create_thread = spudec_CreateThread;
- p_es->thread_id = input_RunDecoder( &decoder,
- (void *)GetVdecConfig( p_input, p_es ) );
+ p_config = (void *)GetVdecConfig( p_input, p_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( &decoder, p_config );
+ vlc_mutex_lock( &p_input->stream.stream_lock );
}
break;
default:
- intf_ErrMsg( "Unknown stream type %d", p_es->i_type );
+ intf_ErrMsg( "Unknown stream type 0x%x", p_es->i_type );
return( -1 );
break;
}
return( -1 );
}
- if( p_es->p_decoder_fifo != NULL )
- {
- 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 )
- {
- 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 );
}
/*****************************************************************************
- * input_UnSelectES: removes an ES from the list of selected ES
+ * input_UnselectES: removes an ES from the list of selected ES
*****************************************************************************/
-int input_UnSelectES( input_thread_t * p_input, es_descriptor_t * p_es )
+int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es )
{
int i_index = 0;
-#ifdef DEBUG_INPUT
- intf_DbgMsg( "UnSelecting ES 0x%x", p_es->i_id );
+ if( p_es == NULL )
+ {
+ intf_ErrMsg( "Nothing to do in input_UnselectES" );
+ return -1;
+ }
+
+#ifdef TRACE_INPUT
+ intf_DbgMsg( "Unselecting ES 0x%x", p_es->i_id );
#endif
if( p_es->p_decoder_fifo == NULL )
{
- intf_ErrMsg( "ES %d is not selected", p_es->i_id );
+ intf_ErrMsg( "ES 0x%x is not selected", p_es->i_id );
return( -1 );
}
input_EndDecoder( p_input, p_es );
- if( p_es->p_decoder_fifo == NULL )
+ if( ( p_es->p_decoder_fifo == NULL ) &&
+ ( p_input->stream.i_selected_es_number > 0 ) )
{
p_input->stream.i_selected_es_number--;
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 )
{
- intf_ErrMsg( "Unable to realloc memory in input_SelectES" );
- return(-1);
+#ifdef TRACE_INPUT
+ intf_DbgMsg( "No more selected ES in input_UnselectES" );
+#endif
+ return( 1 );
}
}
+
return( 0 );
}