Commit b1f71294 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Do not use input while not referenced

parent e95cb50f
...@@ -59,8 +59,6 @@ vlc_module_end () ...@@ -59,8 +59,6 @@ vlc_module_end ()
struct sout_stream_sys_t struct sout_stream_sys_t
{ {
input_thread_t *p_input;
mtime_t i_stream_start; mtime_t i_stream_start;
}; };
...@@ -82,8 +80,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -82,8 +80,6 @@ static int Open( vlc_object_t *p_this )
p_stream->pf_send = Send; p_stream->pf_send = Send;
p_sys = p_stream->p_sys = malloc(sizeof(sout_stream_sys_t)); p_sys = p_stream->p_sys = malloc(sizeof(sout_stream_sys_t));
p_sys->p_input = NULL;
p_sys->i_stream_start = 0; p_sys->i_stream_start = 0;
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -108,25 +104,13 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -108,25 +104,13 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
sout_stream_id_t *id; sout_stream_id_t *id;
es_format_t *p_fmt_copy; es_format_t *p_fmt_copy;
input_item_t *p_item; input_item_t *p_item;
input_thread_t *p_input;
msg_Dbg( p_stream, "Adding a stream" ); msg_Dbg( p_stream, "Adding a stream" );
p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT, FIND_PARENT );
assert( p_input );
if( !p_sys->p_input ) p_item = input_GetItem(p_input);
{
p_sys->p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT,
FIND_PARENT );
/* This module is a children of the input object
* We don't want to keep a reference on it, because we will be alive
* as long as the input is alive.
*
* Since vlc_object_find() increments the reference count,
* we release the input just after finding it.
* */
assert( p_sys->p_input );
vlc_object_release( p_sys->p_input );
}
p_item = input_GetItem(p_sys->p_input);
p_fmt_copy = malloc(sizeof(es_format_t)); p_fmt_copy = malloc(sizeof(es_format_t));
es_format_Copy( p_fmt_copy, p_fmt ); es_format_Copy( p_fmt_copy, p_fmt );
...@@ -134,6 +118,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -134,6 +118,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
vlc_mutex_lock( &p_item->lock ); vlc_mutex_lock( &p_item->lock );
TAB_APPEND( p_item->i_es, p_item->es, p_fmt_copy ); TAB_APPEND( p_item->i_es, p_item->es, p_fmt_copy );
vlc_mutex_unlock( &p_item->lock ); vlc_mutex_unlock( &p_item->lock );
vlc_object_release( p_input );
if( p_sys->i_stream_start <= 0 ) if( p_sys->i_stream_start <= 0 )
p_sys->i_stream_start = mdate(); p_sys->i_stream_start = mdate();
...@@ -159,8 +144,17 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, ...@@ -159,8 +144,17 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
block_ChainRelease( p_buffer ); block_ChainRelease( p_buffer );
if( p_sys->p_input && p_sys->i_stream_start + 1500000 < mdate() ) if( p_sys->i_stream_start + 1500000 < mdate() )
p_sys->p_input->b_eof = true; {
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; return VLC_SUCCESS;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment