[vlc-devel] commit: Disable instance pace control from stream rather than access ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Fri Aug 29 18:25:52 2008 +0300| [9b792408ea505af0960a530001c2b0d345ff624e] | committer: Rémi Denis-Courmont 

Disable instance pace control from stream rather than access

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b792408ea505af0960a530001c2b0d345ff624e
---

 modules/stream_out/es.c       |    5 +++++
 modules/stream_out/standard.c |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c
index 52bb86d..907aa17 100644
--- a/modules/stream_out/es.c
+++ b/modules/stream_out/es.c
@@ -413,6 +413,9 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
         return NULL;
     }
 
+    if( !sout_AccessOutCanControlPace( p_access ) )
+        p_sout->i_out_pace_nocontrol++;
+
     return 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_MuxDelete( id->p_mux );
     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 );
 
     free( id );
diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index 22a673b..7262eab 100644
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -465,6 +465,9 @@ static int Open( vlc_object_t *p_this )
     free( psz_mux );
     free( psz_url );
 
+    if( !sout_AccessOutCanControlPace( p_access ) )
+        p_sout->i_out_pace_nocontrol++;
+
     return VLC_SUCCESS;
 }
 
@@ -481,6 +484,8 @@ static void Close( vlc_object_t * p_this )
         sout_AnnounceUnRegister( p_stream->p_sout, p_sys->p_session );
 
     sout_MuxDelete( p_sys->p_mux );
+    if( !sout_AccessOutCanControlPace( p_access ) )
+        p_stream->p_sout->i_out_pace_nocontrol--;
     sout_AccessOutDelete( p_access );
 
     free( p_sys );