* input_programs.c: es_descriptor_t, pgrm_descriptor_t management
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_programs.c,v 1.32 2001/02/20 02:53:13 stef Exp $
+ * $Id: input_programs.c,v 1.41 2001/03/15 01:42:20 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
{
input_DelES( p_input, p_input->stream.pp_es[0] );
}
+
+ if( p_input->stream.p_demux_data != NULL )
+ {
+ free( p_input->stream.p_demux_data );
+ }
}
/*****************************************************************************
p_input->stream.pp_areas[i_area_index]->i_start = 0;
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 = 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= 0;
ASSERT( p_area );
- intf_DbgMsg("Deleting description for area %d", p_area->i_number);
+ 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;
if( p_input->stream.i_area_nb && p_input->stream.pp_areas == NULL)
{
intf_ErrMsg( "input error: unable to realloc area list"
- " in input_Delarea" );
+ " in input_DelArea" );
}
/* Free the description of this area */
p_es->p_pes = NULL;
p_es->p_decoder_fifo = NULL;
p_es->b_audio = 0;
+ p_es->b_spu = 0;
if( i_data_len )
{
}
-#ifdef STATS
-/*****************************************************************************
- * input_DumpStream: dumps the contents of a stream descriptor
- *****************************************************************************/
-void input_DumpStream( input_thread_t * p_input )
-{
- int i, j;
-#define S p_input->stream
- intf_Msg( "input info: Dumping stream ID 0x%x", S.i_stream_id );
- if( S.b_seekable )
- intf_Msg( "input info: seekable stream, position: %lld/%lld",
- S.pp_areas[0].i_tell, S.pp_areas[0].i_size );
- else
- 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)",
- P->i_number, P->i_version,
- P->b_is_ok ? "complete" : "partial" );
-#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",
- ES->i_id, ES->i_stream_id, ES->i_type,
- ES->p_decoder_fifo != NULL ? "selected" : "not selected");
-#undef ES
- }
- }
-}
-#endif
-
/*****************************************************************************
* InitDecConfig: initializes a decoder_config_t
*****************************************************************************/
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 );
}
/*****************************************************************************
* 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 * );
{
/* FIXME ! */
decoder_capabilities_t decoder;
+ void * p_config;
#ifdef DEBUG_INPUT
intf_DbgMsg( "Selecting ES 0x%x", p_es->i_id );
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;
if( p_main->b_audio )
{
decoder.pf_create_thread = ac3dec_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 = 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 )
+ return( 0 );
+}
+
+/*****************************************************************************
+ * 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 i_index = 0;
+
+#ifdef DEBUG_INPUT
+ intf_DbgMsg( "Unselecting ES 0x%x", p_es->i_id );
+#endif
+
+ if( p_es->p_decoder_fifo == NULL )
+ {
+ intf_ErrMsg( "ES 0x%x is not selected", p_es->i_id );
+ return( -1 );
+ }
+
+ /* Release lock, not to block the input thread. */
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ input_EndDecoder( p_input, p_es );
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+
+ if( p_es->p_decoder_fifo == NULL )
{
- p_input->stream.i_selected_es_number++;
+ p_input->stream.i_selected_es_number--;
+
+ while( ( i_index < p_input->stream.i_selected_es_number ) &&
+ ( p_input->stream.pp_selected_es[i_index] != p_es ) )
+ {
+ i_index++;
+ }
+
+ 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(
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" );
+ intf_ErrMsg( "Unable to realloc memory in input_UnSelectES" );
return(-1);
}
- p_input->stream.pp_selected_es[p_input->stream.i_selected_es_number - 1]
- = p_es;
}
return( 0 );
}
projects / vlc / blobdiff