Use vlc_object_lock and vlc_object_unlock

[vlc] / src / stream_output / stream_output.c

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index f6171935141893ac5ccfb699db9ddf44f8c793f3..30304d9e401f163745ec3c4c7864a41acd4a23fc 100644 (file)
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -31,14 +31,13 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdlib.h>                                                /* free() */
 #include <stdio.h>                                              /* sprintf() */
 #include <string.h>
 
 #include <vlc_sout.h>
-#include <vlc_playlist.h>
 
 #include "stream_output.h"
 
@@ -76,15 +75,14 @@ static void mrl_Clean( mrl_t *p_mrl );
  *****************************************************************************/
 sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest )
 {
+    static const char typename[] = "stream output";
     sout_instance_t *p_sout;
 
     /* *** Allocate descriptor *** */
-    p_sout = vlc_object_create( p_parent, VLC_OBJECT_SOUT );
+    p_sout = vlc_custom_create( p_parent, sizeof( *p_sout ),
+                                VLC_OBJECT_GENERIC, typename );
     if( p_sout == NULL )
-    {
-        msg_Err( p_parent, "out of memory" );
         return NULL;
-    }
 
     /* *** init descriptor *** */
     p_sout->psz_sout    = strdup( psz_dest );
@@ -92,7 +90,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 +158,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 +210,14 @@ 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 ) );
+    if( !p_input )  return NULL;
     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 +245,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' ) )
     {
@@ -530,7 +529,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 );
@@ -595,13 +594,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;
@@ -761,41 +760,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)