* Mandatory step for video output IV and the audio output quality

[vlc] / src / input / input_programs.c

diff --git a/src/input/input_programs.c b/src/input/input_programs.c
index 9c78a2f23544394aa5b33abbc57385cae8ef49d7..12c6efcbdf96911d3e70a30ad11714406c827e0d 100644 (file)
--- a/src/input/input_programs.c
+++ b/src/input/input_programs.c
@@ -2,7 +2,7 @@
  * input_programs.c: es_descriptor_t, pgrm_descriptor_t management
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_programs.c,v 1.51 2001/04/27 19:29:11 massiot Exp $
+ * $Id: input_programs.c,v 1.54 2001/05/01 04:18:18 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -28,6 +28,7 @@
 
 #include <stdlib.h>
 #include <string.h>                                    /* memcpy(), memset() */
+#include <sys/types.h>                                              /* off_t */
 
 #include "config.h"
 #include "common.h"
@@ -173,8 +174,6 @@ pgrm_descriptor_t * input_AddProgram( input_thread_t * p_input,
 
     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 )
     {
@@ -579,7 +578,7 @@ static adec_config_t * GetAdecConfig( input_thread_t * p_input,
         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 );
@@ -598,6 +597,8 @@ static adec_config_t * GetAdecConfig( input_thread_t * p_input,
 /* 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 * );
 
@@ -658,7 +659,15 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
     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 );
 
             /* Release the lock, not to block the input thread during
@@ -668,7 +677,30 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
             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 )
         {