prevent #1312 from occuring (refs #1312)

[vlc] / modules / stream_out / display.c

diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c
index 82fa17183c30577f1b2a8e30dadbbf56f5208f3f..75082ace3b5052709baa37cfb18906b0c54984dc 100644 (file)
--- a/modules/stream_out/display.c
+++ b/modules/stream_out/display.c
@@ -24,7 +24,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
 #include <vlc_input.h>
@@ -77,6 +80,7 @@ static int               Send( sout_stream_t *, sout_stream_id_t *, block_t* );
 struct sout_stream_sys_t
 {
     input_thread_t *p_input;
+    unsigned        i_es;
 
     vlc_bool_t     b_audio;
     vlc_bool_t     b_video;
@@ -91,34 +95,31 @@ static int Open( vlc_object_t *p_this )
 {
     sout_stream_t     *p_stream = (sout_stream_t*)p_this;
     sout_stream_sys_t *p_sys;
-    vlc_value_t val;
-
-    config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
-                   p_stream->p_cfg );
 
-    p_sys          = malloc( sizeof( sout_stream_sys_t ) );
-    p_sys->p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT,
-                                      FIND_PARENT );
-    if( !p_sys->p_input )
+    /* FIXME: this sucks big time (see #1312) */
+    if( var_CreateGetBool( p_stream, "sout-keep" ) )
     {
-        msg_Err( p_stream, "cannot find p_input" );
-        free( p_sys );
+        msg_Err( p_stream, "cannot use #display sout with sout-keep option" );
         return VLC_EGENERIC;
     }
 
-    var_Get( p_stream, SOUT_CFG_PREFIX "audio", &val );
-    p_sys->b_audio = val.b_bool;
+    p_sys = malloc( sizeof( sout_stream_sys_t ) );
+    if( p_sys == NULL )
+        return VLC_ENOMEM;
 
-    var_Get( p_stream, SOUT_CFG_PREFIX "video", &val );
-    p_sys->b_video = val.b_bool;
+    config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
+                   p_stream->p_cfg );
 
-    var_Get( p_stream, SOUT_CFG_PREFIX "delay", &val );
-    p_sys->i_delay = (int64_t)val.i_int * 1000;
+    p_sys->p_input = NULL;
+    p_sys->i_es    = 0;
+    p_sys->b_audio = var_GetBool( p_stream, SOUT_CFG_PREFIX"audio" );
+    p_sys->b_video = var_GetBool( p_stream, SOUT_CFG_PREFIX "video" );
+    p_sys->i_delay = var_GetInteger( p_stream, SOUT_CFG_PREFIX "delay" );
+    p_sys->i_delay *= 1000;
 
     p_stream->pf_add    = Add;
     p_stream->pf_del    = Del;
     p_stream->pf_send   = Send;
-
     p_stream->p_sys     = p_sys;
 
     /* update p_sout->i_out_pace_nocontrol */
@@ -138,7 +139,6 @@ static void Close( vlc_object_t * p_this )
     /* update p_sout->i_out_pace_nocontrol */
     p_stream->p_sout->i_out_pace_nocontrol--;
 
-    vlc_object_release( p_sys->p_input );
     free( p_sys );
 }
 
@@ -159,6 +159,20 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     }
 
     id = malloc( sizeof( sout_stream_id_t ) );
+    if( id == NULL )
+        return NULL;
+
+    if( p_sys->i_es == 0 )
+    {
+        p_sys->p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT,
+                                          FIND_PARENT );
+        if( p_sys->p_input == NULL )
+        {
+            msg_Err( p_stream, "cannot find input" );
+            free( id );
+            return NULL;
+        }
+    }
 
     id->p_dec = input_DecoderNew( p_sys->p_input, p_fmt, VLC_TRUE );
     if( id->p_dec == NULL )
@@ -166,15 +180,21 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
         msg_Err( p_stream, "cannot create decoder for fcc=`%4.4s'",
                  (char*)&p_fmt->i_codec );
         free( id );
+        if( p_sys->i_es == 0 )
+            vlc_object_release( p_sys->p_input );
         return NULL;
     }
 
+    p_sys->i_es++;
     return id;
 }
 
 static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
 {
     input_DecoderDelete( id->p_dec );
+    if( --p_stream->p_sys->i_es == 0)
+        vlc_object_release( p_stream->p_sys->p_input );
+
     free( id );
     return VLC_SUCCESS;
 }