X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fstream_output%2Fstream_output.c;h=a8e0f777f0899ea584e93d5f0777c9c95babb22f;hb=9df284851e95e95a365d058ae26456e6168c84bb;hp=81af00a674b767e5f1ae357809b305e405273bdf;hpb=859436564cd0b85e76b888a88205424ede9cb412;p=vlc

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index 81af00a674..a8e0f777f0 100644
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -92,7 +92,7 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest )
     p_sout->i_out_pace_nocontrol = 0;
     p_sout->p_sys       = NULL;
 
-    vlc_mutex_init( p_sout, &p_sout->lock );
+    vlc_mutex_init( &p_sout->lock );
     if( psz_dest && psz_dest[0] == '#' )
     {
         p_sout->psz_chain = strdup( &psz_dest[1] );
@@ -160,7 +160,7 @@ void sout_UpdateStatistic( sout_instance_t *p_sout, sout_statistic_t i_type, int
     int i_bytes; /* That's pretty stupid to define it as an integer, it will overflow
                     really fast ... */
 
-    if( !p_sout->p_libvlc->b_stats )
+    if( !libvlc_stats (p_sout) )
         return;
 
     /* FIXME that's ugly
@@ -212,13 +212,13 @@ sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout,
 {
     sout_packetizer_input_t *p_input;
 
-    msg_Dbg( p_sout, "adding a new input" );
-
     /* *** create a packetizer input *** */
     p_input         = malloc( sizeof( sout_packetizer_input_t ) );
     p_input->p_sout = p_sout;
     p_input->p_fmt  = p_fmt;
 
+    msg_Dbg( p_sout, "adding a new sout input (sout_input:%p)", p_input );
+
     if( p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
     {
         vlc_object_release( p_sout );
@@ -246,7 +246,7 @@ int sout_InputDelete( sout_packetizer_input_t *p_input )
 {
     sout_instance_t     *p_sout = p_input->p_sout;
 
-    msg_Dbg( p_sout, "removing an input" );
+    msg_Dbg( p_sout, "removing a sout input (sout_input:%p)", p_input );
 
     if( p_input->p_fmt->i_codec != VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
     {
@@ -323,7 +323,7 @@ sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout,
     vlc_object_attach( p_access, p_sout );
 
     p_access->p_module   =
-        module_Need( p_access, "sout access", p_access->psz_access, VLC_TRUE );
+        module_Need( p_access, "sout access", p_access->psz_access, true );
 
     if( !p_access->p_module )
     {
@@ -429,14 +429,14 @@ sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, char *psz_mux,
     p_mux->p_sys        = NULL;
     p_mux->p_module     = NULL;
 
-    p_mux->b_add_stream_any_time = VLC_FALSE;
-    p_mux->b_waiting_stream = VLC_TRUE;
+    p_mux->b_add_stream_any_time = false;
+    p_mux->b_waiting_stream = true;
     p_mux->i_add_stream_start = -1;
 
     vlc_object_attach( p_mux, p_sout );
 
     p_mux->p_module =
-        module_Need( p_mux, "sout mux", p_mux->psz_mux, VLC_TRUE );
+        module_Need( p_mux, "sout mux", p_mux->psz_mux, true );
 
     if( p_mux->p_module == NULL )
     {
@@ -450,37 +450,37 @@ sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, char *psz_mux,
     /* *** probe mux capacity *** */
     if( p_mux->pf_control )
     {
-        int b_answer = VLC_FALSE;
+        int b_answer = false;
 
         if( sout_MuxControl( p_mux, MUX_CAN_ADD_STREAM_WHILE_MUXING,
                              &b_answer ) )
         {
-            b_answer = VLC_FALSE;
+            b_answer = false;
         }
 
         if( b_answer )
         {
             msg_Dbg( p_sout, "muxer support adding stream at any time" );
-            p_mux->b_add_stream_any_time = VLC_TRUE;
-            p_mux->b_waiting_stream = VLC_FALSE;
+            p_mux->b_add_stream_any_time = true;
+            p_mux->b_waiting_stream = false;
 
             /* If we control the output pace then it's better to wait before
              * starting muxing (generates better streams/files). */
             if( !p_sout->i_out_pace_nocontrol )
             {
-                b_answer = VLC_TRUE;
+                b_answer = true;
             }
             else if( sout_MuxControl( p_mux, MUX_GET_ADD_STREAM_WAIT,
                                       &b_answer ) )
             {
-                b_answer = VLC_FALSE;
+                b_answer = false;
             }
 
             if( b_answer )
             {
                 msg_Dbg( p_sout, "muxer prefers to wait for all ES before "
                          "starting to mux" );
-                p_mux->b_waiting_stream = VLC_TRUE;
+                p_mux->b_waiting_stream = true;
             }
         }
     }
@@ -530,7 +530,7 @@ sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux, es_format_t *p_fmt )
     }
     p_input->p_sout = p_mux->p_sout;
     p_input->p_fmt  = p_fmt;
-    p_input->p_fifo = block_FifoNew( p_mux->p_sout );
+    p_input->p_fifo = block_FifoNew();
     p_input->p_sys  = NULL;
 
     TAB_APPEND( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input );
@@ -558,7 +558,7 @@ void sout_MuxDeleteStream( sout_mux_t *p_mux, sout_input_t *p_input )
     {
         /* We stop waiting, and call the muxer for taking care of the data
          * before we remove this es */
-        p_mux->b_waiting_stream = VLC_FALSE;
+        p_mux->b_waiting_stream = false;
         p_mux->pf_mux( p_mux );
     }
 
@@ -595,13 +595,13 @@ void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input,
     {
         mtime_t current_date = mdate();
         if ( current_date > p_buffer->i_dts )
-            msg_Warn( p_mux, "late buffer for mux input ("I64Fd")",
+            msg_Warn( p_mux, "late buffer for mux input (%"PRId64")",
                       current_date - p_buffer->i_dts );
     }
 
     if( p_mux->b_waiting_stream )
     {
-        const int64_t i_caching = var_GetInteger( p_mux->p_sout, "sout-mux-caching" ) * I64C(1000);
+        const int64_t i_caching = var_GetInteger( p_mux->p_sout, "sout-mux-caching" ) * INT64_C(1000);
 
         if( p_mux->i_add_stream_start < 0 )
             p_mux->i_add_stream_start = p_buffer->i_dts;
@@ -610,7 +610,7 @@ void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input,
         if( p_mux->i_add_stream_start < 0 ||
             p_buffer->i_dts < p_mux->i_add_stream_start + i_caching )
             return;
-        p_mux->b_waiting_stream = VLC_FALSE;
+        p_mux->b_waiting_stream = false;
     }
     p_mux->pf_mux( p_mux );
 }
@@ -761,41 +761,6 @@ static void mrl_Clean( mrl_t *p_mrl )
  *  return a pointer on the rest
  *  XXX: psz_chain is modified
  */
-#define SKIPSPACE( p ) { while( *p && ( *p == ' ' || *p == '\t' ) ) p++; }
-#define SKIPTRAILINGSPACE( p, e ) \
-    { while( e > p && ( *(e-1) == ' ' || *(e-1) == '\t' ) ) e--; }
-
-/* go accross " " and { } */
-static char *_get_chain_end( char *str )
-{
-    char c, *p = str;
-
-    SKIPSPACE( p );
-
-    for( ;; )
-    {
-        if( !*p || *p == ',' || *p == '}' ) return p;
-
-        if( *p != '{' && *p != '"' && *p != '\'' )
-        {
-            p++;
-            continue;
-        }
-
-        if( *p == '{' ) c = '}';
-        else c = *p;
-        p++;
-
-        for( ;; )
-        {
-            if( !*p ) return p;
-
-            if( *p == c ) return ++p;
-            else if( *p == '{' && c == '}' ) p = _get_chain_end( p );
-            else p++;
-        }
-    }
-}
 
 /*
  * XXX name and p_cfg are used (-> do NOT free them)
@@ -829,7 +794,7 @@ sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_chain )
     vlc_object_attach( p_stream, p_sout );
 
     p_stream->p_module =
-        module_Need( p_stream, "sout stream", p_stream->psz_name, VLC_TRUE );
+        module_Need( p_stream, "sout stream", p_stream->psz_name, true );
 
     if( !p_stream->p_module )
     {