Removes trailing spaces. Removes tabs.

[vlc] / modules / stream_out / description.c

diff --git a/modules/stream_out/description.c b/modules/stream_out/description.c
index 302fdb21ee89e7183cab3a645a3813319fdbb273..6e855fea9e9bb17d7c82280266602827937ce3cf 100644 (file)
--- a/modules/stream_out/description.c
+++ b/modules/stream_out/description.c
@@ -18,18 +18,17 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
+#include <vlc_input.h>
+#include <vlc_block.h>
+#include <vlc_sout.h>
 
 /*****************************************************************************
  * Exported prototypes
@@ -53,7 +52,9 @@ vlc_module_end();
 
 struct sout_stream_sys_t
 {
+    int            i_id;
     input_thread_t *p_input;
+
     mtime_t i_stream_start;
 };
 
@@ -75,8 +76,8 @@ static int Open( vlc_object_t *p_this )
     p_stream->pf_send = Send;
     p_sys = p_stream->p_sys = malloc(sizeof(sout_stream_sys_t));
 
-    p_sys->p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT );
-    if( !p_sys->p_input ) return VLC_EGENERIC;
+    p_sys->i_id = 0;
+    p_sys->p_input = NULL;
 
     p_sys->i_stream_start = 0;
 
@@ -89,32 +90,55 @@ static int Open( vlc_object_t *p_this )
 static void Close( vlc_object_t *p_this )
 {
     sout_stream_t *p_stream = (sout_stream_t *)p_this;
-    vlc_object_release( p_stream->p_sys->p_input );
+    sout_stream_sys_t *p_sys = p_stream->p_sys;
+
+    /* It can happen only if buggy */
+    if( p_sys->p_input )
+        vlc_object_release( p_sys->p_input );
+    free( p_sys );
 }
 
 static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
     sout_stream_id_t *id;
-    es_format_t *p_fmt_copy = malloc(sizeof(es_format_t));
+    es_format_t *p_fmt_copy;
+    input_item_t *p_item;
 
-    id = malloc( sizeof( sout_stream_id_t ) );
-    id->i_d_u_m_m_y = 0;
+    if( !p_sys->p_input )
+        p_sys->p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT, FIND_PARENT );
+    if( !p_sys->p_input )
+        return NULL;
+ 
+    p_item = input_GetItem(p_sys->p_input);
 
+    p_fmt_copy = malloc(sizeof(es_format_t));
     es_format_Copy( p_fmt_copy, p_fmt );
 
-    vlc_mutex_lock( &p_sys->p_input->input.p_item->lock );
-    TAB_APPEND( p_sys->p_input->input.p_item->i_es,
-                p_sys->p_input->input.p_item->es, p_fmt_copy );
-    vlc_mutex_unlock( &p_sys->p_input->input.p_item->lock );
+    vlc_mutex_lock( &p_item->lock );
+    TAB_APPEND( p_item->i_es, p_item->es, p_fmt_copy );
+    vlc_mutex_unlock( &p_item->lock );
 
-    if( p_sys->i_stream_start <= 0 ) p_sys->i_stream_start = mdate();
+    p_sys->i_id++;
+    if( p_sys->i_stream_start <= 0 )
+        p_sys->i_stream_start = mdate();
 
+    id = malloc( sizeof( sout_stream_id_t ) );
+    id->i_d_u_m_m_y = 0;
     return id;
 }
 
 static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
 {
+    sout_stream_sys_t *p_sys = p_stream->p_sys;
+
+    p_sys->i_id--;
+    if( p_sys->i_id <= 0 )
+    {
+        vlc_object_release( p_sys->p_input );
+        p_sys->p_input = NULL;
+    }
+
     free( id );
     return VLC_SUCCESS;
 }
@@ -126,10 +150,8 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
 
     block_ChainRelease( p_buffer );
 
-    if( p_sys->i_stream_start + 1500000 < mdate() )
-    {
+    if( p_sys->p_input && p_sys->i_stream_start + 1500000 < mdate() )
         p_sys->p_input->b_eof = VLC_TRUE;
-    }
 
     return VLC_SUCCESS;
 }