* input_programs.c: es_descriptor_t, pgrm_descriptor_t management
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_programs.c,v 1.50 2001/04/22 00:08:26 stef Exp $
+ * $Id: input_programs.c,v 1.60 2001/07/17 09:48:08 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
#include <stdlib.h>
#include <string.h> /* memcpy(), memset() */
+#include <sys/types.h> /* off_t */
#include "config.h"
#include "common.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
-#include "input.h"
+#include "input_ext-plugins.h"
#include "main.h" /* --noaudio --novideo */
p_input->stream.b_changed = 0;
p_input->stream.pp_es = NULL;
p_input->stream.pp_selected_es = NULL;
+ p_input->stream.p_removed_es = NULL;
+ p_input->stream.p_newly_selected_es = NULL;
p_input->stream.pp_programs = NULL;
if( i_data_len )
p_input->stream.pp_programs[i_pgrm_index]->i_synchro_state
= SYNCHRO_START;
- 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_programs[i_pgrm_index]->p_demux_data =
p_config->p_decoder_fifo->pf_delete_pes = p_input->pf_delete_pes;
p_es->p_decoder_fifo = p_config->p_decoder_fifo;
- p_config->pf_init_bit_stream = InitBitstream;
+ p_config->pf_init_bit_stream = p_input->pf_init_bit_stream;
p_input->stream.i_selected_es_number++;
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 );
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 );
/* 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 * );
+vlc_thread_t lpcmdec_CreateThread( void * );
int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
{
return -1;
}
-#ifdef DEBUG_INPUT
+#ifdef TRACE_INPUT
intf_DbgMsg( "Selecting ES 0x%x", p_es->i_id );
#endif
{
decoder.pf_create_thread = adec_CreateThread;
p_config = (void *)GetAdecConfig( p_input, p_es );
+ p_main->b_ac3 = 0;
/* Release the lock, not to block the input thread during
* the creation of the thread. */
case AC3_AUDIO_ES:
if( p_main->b_audio )
{
- decoder.pf_create_thread = ac3dec_CreateThread;
+ 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 );
+ p_main->b_ac3 = 1;
/* Release the lock, not to block the input thread during
* the creation of the thread. */
vlc_mutex_lock( &p_input->stream.stream_lock );
}
break;
+ case LPCM_AUDIO_ES:
+ if( p_main->b_audio )
+ {
+ decoder.pf_create_thread = lpcmdec_CreateThread;
+ p_config = (void *)GetAdecConfig( p_input, p_es );
+ p_main->b_ac3 = 0;
+ /* 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 DVD_SPU_ES:
if( p_main->b_video )
{
return -1;
}
-#ifdef DEBUG_INPUT
+#ifdef TRACE_INPUT
intf_DbgMsg( "Unselecting ES 0x%x", p_es->i_id );
#endif
if( p_input->stream.pp_selected_es == NULL )
{
-#ifdef DEBUG_INPUT
+#ifdef TRACE_INPUT
intf_DbgMsg( "No more selected ES in input_UnselectES" );
#endif
return( 1 );