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

Disable instance pace control from stream rather than access

parent c8a5be75
...@@ -413,6 +413,9 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -413,6 +413,9 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
return NULL; return NULL;
} }
if( !sout_AccessOutCanControlPace( p_access ) )
p_sout->i_out_pace_nocontrol++;
return id; return id;
} }
...@@ -422,6 +425,8 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) ...@@ -422,6 +425,8 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
sout_access_out_t *p_access = id->p_mux->p_access; sout_access_out_t *p_access = id->p_mux->p_access;
sout_MuxDelete( id->p_mux ); sout_MuxDelete( id->p_mux );
sout_MuxDeleteStream( id->p_mux, id->p_input ); sout_MuxDeleteStream( id->p_mux, id->p_input );
if( !sout_AccessOutCanControlPace( p_access ) )
p_stream->p_sout->i_out_pace_nocontrol--;
sout_AccessOutDelete( p_access ); sout_AccessOutDelete( p_access );
free( id ); free( id );
......
...@@ -465,6 +465,9 @@ static int Open( vlc_object_t *p_this ) ...@@ -465,6 +465,9 @@ static int Open( vlc_object_t *p_this )
free( psz_mux ); free( psz_mux );
free( psz_url ); free( psz_url );
if( !sout_AccessOutCanControlPace( p_access ) )
p_sout->i_out_pace_nocontrol++;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -481,6 +484,8 @@ static void Close( vlc_object_t * p_this ) ...@@ -481,6 +484,8 @@ static void Close( vlc_object_t * p_this )
sout_AnnounceUnRegister( p_stream->p_sout, p_sys->p_session ); sout_AnnounceUnRegister( p_stream->p_sout, p_sys->p_session );
sout_MuxDelete( p_sys->p_mux ); sout_MuxDelete( p_sys->p_mux );
if( !sout_AccessOutCanControlPace( p_access ) )
p_stream->p_sout->i_out_pace_nocontrol--;
sout_AccessOutDelete( p_access ); sout_AccessOutDelete( p_access );
free( p_sys ); free( p_sys );
......
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