* Made input_SelectES() and input_UnselectES() not block the input thread

for a long time.

diff --git a/include/input.h b/include/input.h
index 657bbcf0487634054dadebc3a620c0004ec41e37..de924fff4f37cc41114a4f05101e8d1f303099b8 100644 (file)
--- a/include/input.h
+++ b/include/input.h
@@ -2,7 +2,7 @@
  * input.h: structures of the input not exported to other modules
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input.h,v 1.32 2001/02/22 16:17:12 massiot Exp $
+ * $Id: input.h,v 1.33 2001/03/02 13:49:37 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -65,7 +65,7 @@ struct es_descriptor_s * input_AddES ( struct input_thread_s *,
                                        size_t );
 void input_DelES     ( struct input_thread_s *, struct es_descriptor_s * );
 int  input_SelectES  ( struct input_thread_s *, struct es_descriptor_s * );
-int  input_UnSelectES( struct input_thread_s *, struct es_descriptor_s * );
+int  input_UnselectES( struct input_thread_s *, struct es_descriptor_s * );
 
 /*****************************************************************************
  * Prototypes from input_dec.c

diff --git a/plugins/dvd/input_dvd.c b/plugins/dvd/input_dvd.c
index 8ef2cfb49bce59408cb943c2ade8f063b6a70345..2103592cfeeb25ceba8099493142c16022a9a501 100644 (file)
--- a/plugins/dvd/input_dvd.c
+++ b/plugins/dvd/input_dvd.c
@@ -10,7 +10,7 @@
  *  -dvd_udf to find files
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.23 2001/03/02 13:47:01 sam Exp $
+ * $Id: input_dvd.c,v 1.24 2001/03/02 13:49:37 massiot Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -599,7 +599,7 @@ static int DVDSetArea( input_thread_t * p_input,
             
             if( p_input->stream.pp_selected_es[i_index] != p_es )
             {
-                input_UnSelectES( p_input,
+                input_UnselectES( p_input,
                                   p_input->stream.pp_selected_es[i_index] );
                 input_SelectES( p_input, p_es );
                 intf_WarnMsg( 1, "DVD: Audio %d selected -> %s (0x%x)",

diff --git a/src/input/input_programs.c b/src/input/input_programs.c
index ac7d664f9ba074ae22f8d95969ff1c6c3e861699..ad72962ff42926130b80723651566537f7726a63 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.37 2001/02/23 12:37:31 massiot Exp $
+ * $Id: input_programs.c,v 1.38 2001/03/02 13:49:37 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -502,6 +502,19 @@ static int InitDecConfig( input_thread_t * p_input, es_descriptor_t * p_es,
 
     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 );
 }
 
@@ -555,6 +568,9 @@ static adec_config_t * GetAdecConfig( input_thread_t * p_input,
 
 /*****************************************************************************
  * 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 * );
@@ -566,6 +582,7 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
 {
     /* FIXME ! */
     decoder_capabilities_t  decoder;
+    void *                  p_config;
 
 #ifdef DEBUG_INPUT
     intf_DbgMsg( "Selecting ES 0x%x", p_es->i_id );
@@ -584,8 +601,13 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
         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;
 
@@ -594,8 +616,13 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
         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;
 
@@ -603,8 +630,13 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
         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;
 
@@ -612,8 +644,13 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
         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;
 
@@ -628,34 +665,19 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
         return( -1 );
     }
 
-    if( p_es->p_decoder_fifo != NULL )
-    {
-        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_UnSelectES: removes an ES from the list of selected ES
+ * 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 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 );
+    intf_DbgMsg( "Unselecting ES 0x%x", p_es->i_id );
 #endif
 
     if( p_es->p_decoder_fifo == NULL )
@@ -664,7 +686,10 @@ int input_UnSelectES( input_thread_t * p_input, es_descriptor_t * p_es )
         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 )
     {
@@ -685,7 +710,7 @@ int input_UnSelectES( input_thread_t * p_input, es_descriptor_t * p_es )
                                             * 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);
         }
     }