/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_block.h>
#include <vlc_sout.h>
+#include <assert.h>
+
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_description( _("Description stream output") );
- set_capability( "sout stream", 50 );
- add_shortcut( "description" );
- set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("Description stream output") )
+ set_capability( "sout stream", 50 )
+ add_shortcut( "description" )
+ set_callbacks( Open, Close )
+vlc_module_end ()
struct sout_stream_sys_t
{
- int i_id;
- input_thread_t *p_input;
-
mtime_t i_stream_start;
};
struct sout_stream_id_t
{
- int i_d_u_m_m_y;
};
/*****************************************************************************
p_stream->pf_send = Send;
p_sys = p_stream->p_sys = malloc(sizeof(sout_stream_sys_t));
- p_sys->i_id = 0;
- p_sys->p_input = NULL;
-
p_sys->i_stream_start = 0;
return VLC_SUCCESS;
sout_stream_t *p_stream = (sout_stream_t *)p_this;
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 );
+ msg_Dbg( p_this, "Closing" );
+
+ free( p_sys );
}
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
sout_stream_id_t *id;
es_format_t *p_fmt_copy;
input_item_t *p_item;
+ input_thread_t *p_input;
- 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);
+ msg_Dbg( p_stream, "Adding a stream" );
+ p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT, FIND_PARENT );
+ assert( p_input );
+
+ p_item = input_GetItem(p_input);
p_fmt_copy = malloc(sizeof(es_format_t));
es_format_Copy( p_fmt_copy, p_fmt );
vlc_mutex_lock( &p_item->lock );
TAB_APPEND( p_item->i_es, p_item->es, p_fmt_copy );
vlc_mutex_unlock( &p_item->lock );
+ vlc_object_release( p_input );
- 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;
- }
+ msg_Dbg( p_stream, "Removing a stream" );
free( id );
return VLC_SUCCESS;
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
block_t *p_buffer )
{
+ VLC_UNUSED(id);
sout_stream_sys_t *p_sys = p_stream->p_sys;
block_ChainRelease( p_buffer );
- if( p_sys->p_input && p_sys->i_stream_start + 1500000 < mdate() )
- p_sys->p_input->b_eof = VLC_TRUE;
+ if( p_sys->i_stream_start + 1500000 < mdate() )
+ {
+ input_thread_t *p_input;
+
+ p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT, FIND_PARENT );
+ if( p_input )
+ {
+ p_input->b_eof = true;
+ vlc_object_release( p_input );
+ }
+ }
return VLC_SUCCESS;
}