Fixed the "paused movie won't restart" bug.

[vlc] / src / input / input_programs.c

diff --git a/src/input/input_programs.c b/src/input/input_programs.c
index 2d9c09b96b5c6178e6a639fc58938eb82b01d87a..2f994048fff71baac3b2023c602d876bcae433b5 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.47 2001/04/12 02:40:09 stef Exp $
+ * $Id: input_programs.c,v 1.60 2001/07/17 09:48:08 massiot 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"
@@ -40,7 +41,7 @@
 #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 */
 
@@ -54,9 +55,17 @@
  *****************************************************************************/
 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.p_removed_es = NULL;
+    p_input->stream.p_newly_selected_es = NULL;
     p_input->stream.pp_programs = NULL;
 
     if( i_data_len )
@@ -165,11 +174,6 @@ pgrm_descriptor_t * input_AddProgram( input_thread_t * p_input,
     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 =
@@ -278,6 +282,8 @@ input_area_t * input_AddArea( input_thread_t * p_input )
     p_input->stream.pp_areas[i_area_index]->i_seek = NO_SEEK;
     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];
 }
@@ -514,7 +520,7 @@ static int InitDecConfig( input_thread_t * p_input, es_descriptor_t * p_es,
     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++;
 
@@ -547,7 +553,6 @@ static vdec_config_t * GetVdecConfig( input_thread_t * p_input,
         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 );
@@ -571,7 +576,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 );
@@ -590,8 +595,11 @@ 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 * );
+vlc_thread_t lpcmdec_CreateThread( void * );
 
 int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
 {
@@ -605,7 +613,7 @@ 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
 
@@ -623,6 +631,7 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
         {
             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. */
@@ -650,8 +659,17 @@ 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 );
+            p_main->b_ac3 = 1;
 
             /* Release the lock, not to block the input thread during
              * the creation of the thread. */
@@ -660,7 +678,20 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
             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 )
         {
@@ -703,7 +734,7 @@ int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es )
         return -1;
     }
 
-#ifdef DEBUG_INPUT
+#ifdef TRACE_INPUT
     intf_DbgMsg( "Unselecting ES 0x%x", p_es->i_id );
 #endif
 
@@ -736,7 +767,7 @@ int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es )
 
         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 );