Commit 5ae87b7e authored by Stéphane Borel's avatar Stéphane Borel
Browse files

-LPCM audio selection in ps mode, in prevision of henri's decoder.

parent 31e42cb1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_ps.c: PS demux and packet management * input_ps.c: PS demux and packet management
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: input_ps.c,v 1.23 2001/05/08 00:43:57 sam Exp $ * $Id: input_ps.c,v 1.24 2001/05/23 17:47:34 stef Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Cyril Deguet <asmax@via.ecp.fr> * Cyril Deguet <asmax@via.ecp.fr>
...@@ -338,7 +338,16 @@ static void PSInit( input_thread_t * p_input ) ...@@ -338,7 +338,16 @@ static void PSInit( input_thread_t * p_input )
break; break;
case LPCM_AUDIO_ES: case LPCM_AUDIO_ES:
/* FIXME ! */ if( main_GetIntVariable( INPUT_CHANNEL_VAR, 0 )
== ((p_es->i_id & 0x1F00) >> 8) )
switch( main_GetIntVariable( INPUT_AUDIO_VAR, 0 ) )
{
case 0:
main_PutIntVariable( INPUT_AUDIO_VAR,
REQUESTED_LPCM );
case REQUESTED_LPCM:
input_SelectES( p_input, p_es );
}
break; break;
} }
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_programs.c: es_descriptor_t, pgrm_descriptor_t management * input_programs.c: es_descriptor_t, pgrm_descriptor_t management
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: input_programs.c,v 1.56 2001/05/19 00:39:30 stef Exp $ * $Id: input_programs.c,v 1.57 2001/05/23 17:47:34 stef Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -599,6 +599,7 @@ vlc_thread_t ac3spdif_CreateThread( void * ); ...@@ -599,6 +599,7 @@ vlc_thread_t ac3spdif_CreateThread( void * );
vlc_thread_t spdif_CreateThread( void * ); vlc_thread_t spdif_CreateThread( void * );
vlc_thread_t vpar_CreateThread( void * ); vlc_thread_t vpar_CreateThread( void * );
vlc_thread_t spudec_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 ) int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
{ {
...@@ -678,9 +679,7 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es ) ...@@ -678,9 +679,7 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
case LPCM_AUDIO_ES: case LPCM_AUDIO_ES:
if( p_main->b_audio ) if( p_main->b_audio )
{ {
intf_ErrMsg( "input error: LPCM audio not handled yet" ); decoder.pf_create_thread = lpcmdec_CreateThread;
break;
p_config = (void *)GetAdecConfig( p_input, p_es ); p_config = (void *)GetAdecConfig( p_input, p_es );
/* Release the lock, not to block the input thread during /* Release the lock, not to block the input thread during
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment