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] );
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
{
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 );
{
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' ) )
{
}
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 );
{
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;
* 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)