/*****************************************************************************
* stream_output.c : stream output module
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: stream_output.c,v 1.33 2003/08/09 14:59:24 gbazin Exp $
+ * Copyright (C) 2002-2007 the VideoLAN team
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Laurent Aimar <fenrir@via.ecp.fr>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
+
+#include <vlc/vlc.h>
+
#include <stdlib.h> /* free() */
#include <stdio.h> /* sprintf() */
#include <string.h> /* strerror() */
-#include <vlc/vlc.h>
+#include <vlc_sout.h>
+#include <vlc_playlist.h>
+
+#include "stream_output.h"
+
+#include <vlc_meta.h>
+
+#include "input/input_internal.h"
-#include <vlc/sout.h>
#undef DEBUG_BUFFER
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void sout_cfg_free( sout_cfg_t * );
-
-#define sout_stream_url_to_chain( p, s ) _sout_stream_url_to_chain( VLC_OBJECT(p), s )
+#define sout_stream_url_to_chain( p, s ) \
+ _sout_stream_url_to_chain( VLC_OBJECT(p), s )
static char *_sout_stream_url_to_chain( vlc_object_t *, char * );
-#define module_NeedStrict(a,b,c) __module_NeedStrict(VLC_OBJECT(a),b,c)
-static module_t *__module_NeedStrict( vlc_object_t *, const char *, const char * );
-
/*
* Generic MRL parser
*
typedef struct
{
- char *psz_access;
-
- char *psz_way;
-
+ char *psz_access;
+ char *psz_way;
char *psz_name;
} mrl_t;
/* mrl_Parse: parse psz_mrl and fill p_mrl */
-static int mrl_Parse( mrl_t *p_mrl, char *psz_mrl );
+static int mrl_Parse( mrl_t *p_mrl, const char *psz_mrl );
/* mrl_Clean: clean p_mrl after a call to mrl_Parse */
static void mrl_Clean( mrl_t *p_mrl );
-#define FREE( p ) if( p ) { free( p ); (p) = NULL; }
-
/*****************************************************************************
* sout_NewInstance: creates a new stream output instance
*****************************************************************************/
-sout_instance_t * __sout_NewInstance ( vlc_object_t *p_parent,
- char * psz_dest )
+sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest )
{
sout_instance_t *p_sout;
/* *** init descriptor *** */
p_sout->psz_sout = strdup( psz_dest );
- p_sout->i_preheader = 0;
- p_sout->i_padding = 0;
+ p_sout->p_meta = NULL;
+ p_sout->i_out_pace_nocontrol = 0;
p_sout->p_sys = NULL;
vlc_mutex_init( p_sout, &p_sout->lock );
p_sout->psz_chain = sout_stream_url_to_chain( p_sout, psz_dest );
msg_Dbg( p_sout, "using sout chain=`%s'", p_sout->psz_chain );
}
+ p_sout->p_stream = NULL;
- p_sout->p_stream = sout_stream_new( p_sout, p_sout->psz_chain );
+ /* attach it for inherit */
+ vlc_object_attach( p_sout, p_parent );
+
+ p_sout->p_stream = sout_StreamNew( p_sout, p_sout->psz_chain );
if( p_sout->p_stream == NULL )
{
- msg_Err( p_sout, "stream chained failed for `%s'", p_sout->psz_chain );
+ msg_Err( p_sout, "stream chain failed for `%s'", p_sout->psz_chain );
- FREE( p_sout->psz_sout );
- FREE( p_sout->psz_chain );
+ FREENULL( p_sout->psz_sout );
+ FREENULL( p_sout->psz_chain );
+ vlc_object_detach( p_sout );
vlc_object_destroy( p_sout );
- return( NULL );
+ return NULL;
}
- vlc_object_attach( p_sout, p_parent );
-
return p_sout;
}
+
/*****************************************************************************
* sout_DeleteInstance: delete a previously allocated instance
*****************************************************************************/
void sout_DeleteInstance( sout_instance_t * p_sout )
{
- /* Unlink object */
- vlc_object_detach( p_sout );
+ /* remove the stream out chain */
+ sout_StreamDelete( p_sout->p_stream );
/* *** free all string *** */
- FREE( p_sout->psz_sout );
- FREE( p_sout->psz_chain );
+ FREENULL( p_sout->psz_sout );
+ FREENULL( p_sout->psz_chain );
+
+ /* delete meta */
+ if( p_sout->p_meta )
+ {
+ vlc_meta_Delete( p_sout->p_meta );
+ }
- sout_stream_delete( p_sout->p_stream );
vlc_mutex_destroy( &p_sout->lock );
/* *** free structure *** */
/*****************************************************************************
* Packetizer/Input
*****************************************************************************/
-sout_packetizer_input_t *__sout_InputNew( vlc_object_t *p_this,
- sout_format_t *p_fmt )
+sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout,
+ es_format_t *p_fmt )
{
- sout_instance_t *p_sout = NULL;
sout_packetizer_input_t *p_input;
- int i_try;
-
- /* search an stream output */
- for( i_try = 0; i_try < 12; i_try++ )
- {
- p_sout = vlc_object_find( p_this, VLC_OBJECT_SOUT, FIND_ANYWHERE );
- if( p_sout )
- {
- break;
- }
-
- msleep( 100*1000 );
- msg_Dbg( p_this, "waiting for sout" );
- }
-
- if( !p_sout )
- {
- msg_Err( p_this, "cannot find any stream ouput" );
- return( NULL );
- }
-
msg_Dbg( p_sout, "adding a new input" );
/* *** create a packetizer input *** */
p_input->p_sout = p_sout;
p_input->p_fmt = p_fmt;
- if( p_fmt->i_fourcc == VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
+ if( p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
{
vlc_object_release( p_sout );
return p_input;
/* *** add it to the stream chain */
vlc_mutex_lock( &p_sout->lock );
- p_input->id = p_sout->p_stream->pf_add( p_sout->p_stream,
- p_fmt );
+ p_input->id = p_sout->p_stream->pf_add( p_sout->p_stream, p_fmt );
vlc_mutex_unlock( &p_sout->lock );
- vlc_object_release( p_sout );
-
if( p_input->id == NULL )
{
free( p_input );
- return( NULL );
+ return NULL;
}
return( p_input );
}
-
+/*****************************************************************************
+ *
+ *****************************************************************************/
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" );
- if( p_input->p_fmt->i_fourcc != VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
+ if( p_input->p_fmt->i_codec != VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
{
vlc_mutex_lock( &p_sout->lock );
p_sout->p_stream->pf_del( p_sout->p_stream, p_input->id );
return( VLC_SUCCESS);
}
-
-int sout_InputSendBuffer( sout_packetizer_input_t *p_input, sout_buffer_t *p_buffer )
+/*****************************************************************************
+ *
+ *****************************************************************************/
+int sout_InputSendBuffer( sout_packetizer_input_t *p_input,
+ block_t *p_buffer )
{
sout_instance_t *p_sout = p_input->p_sout;
int i_ret;
- if( p_input->p_fmt->i_fourcc == VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
+ if( p_input->p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
+ {
+ block_Release( p_buffer );
+ return VLC_SUCCESS;
+ }
+ if( p_buffer->i_dts <= 0 )
{
- sout_BufferDelete( p_input->p_sout, p_buffer );
+ msg_Warn( p_sout, "trying to send non-dated packet to stream output!");
+ block_Release( p_buffer );
return VLC_SUCCESS;
}
vlc_mutex_lock( &p_sout->lock );
- i_ret = p_sout->p_stream->pf_send( p_sout->p_stream, p_input->id, p_buffer );
+ i_ret = p_sout->p_stream->pf_send( p_sout->p_stream,
+ p_input->id, p_buffer );
vlc_mutex_unlock( &p_sout->lock );
return i_ret;
* sout_AccessOutNew: allocate a new access out
*****************************************************************************/
sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout,
- char *psz_access, char *psz_name )
+ const char *psz_access, const char *psz_name )
{
sout_access_out_t *p_access;
char *psz_next;
return NULL;
}
- psz_next = sout_cfg_parser( &p_access->psz_access, &p_access->p_cfg, psz_access );
+ psz_next = config_ChainCreate( &p_access->psz_access, &p_access->p_cfg,
+ psz_access );
if( psz_next )
{
free( psz_next );
}
- p_access->psz_name = strdup( psz_name ? psz_name : "" );
+ p_access->psz_path = strdup( psz_name ? psz_name : "" );
p_access->p_sout = p_sout;
p_access->p_sys = NULL;
p_access->pf_seek = NULL;
+ p_access->pf_read = NULL;
p_access->pf_write = NULL;
+ p_access->pf_control = NULL;
+ p_access->p_module = NULL;
+
+ p_access->i_writes = 0;
+ p_access->i_sent_bytes = 0;
+
+ vlc_object_attach( p_access, p_sout );
p_access->p_module =
- module_NeedStrict( p_access, "sout access", p_access->psz_access );
+ module_Need( p_access, "sout access", p_access->psz_access, VLC_TRUE );
if( !p_access->p_module )
{
free( p_access->psz_access );
- free( p_access->psz_name );
+ free( p_access->psz_path );
+ vlc_object_detach( p_access );
vlc_object_destroy( p_access );
return( NULL );
}
*****************************************************************************/
void sout_AccessOutDelete( sout_access_out_t *p_access )
{
+ vlc_object_detach( p_access );
if( p_access->p_module )
{
module_Unneed( p_access, p_access->p_module );
}
free( p_access->psz_access );
- sout_cfg_free( p_access->p_cfg );
+ config_ChainDestroy( p_access->p_cfg );
- free( p_access->psz_name );
+ free( p_access->psz_path );
vlc_object_destroy( p_access );
}
/*****************************************************************************
* sout_AccessSeek:
*****************************************************************************/
-int sout_AccessOutSeek( sout_access_out_t *p_access, off_t i_pos )
+int sout_AccessOutSeek( sout_access_out_t *p_access, off_t i_pos )
{
- return( p_access->pf_seek( p_access, i_pos ) );
+ return p_access->pf_seek( p_access, i_pos );
}
/*****************************************************************************
- * sout_AccessWrite:
+ * sout_AccessRead:
*****************************************************************************/
-int sout_AccessOutWrite( sout_access_out_t *p_access, sout_buffer_t *p_buffer )
+int sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer )
{
- return( p_access->pf_write( p_access, p_buffer ) );
+ return( p_access->pf_read ?
+ p_access->pf_read( p_access, p_buffer ) : VLC_EGENERIC );
+}
+
+/*****************************************************************************
+ * sout_AccessWrite:
+ *****************************************************************************/
+int sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
+{
+ int i_total = 0;
+ p_access->i_writes++;
+ p_access->i_sent_bytes += p_buffer->i_buffer;
+ if( p_access->p_libvlc->b_stats && p_access->i_writes % 30 == 0 )
+ {
+ /* Access_out -> sout_instance -> input_thread_t */
+ input_thread_t *p_input =
+ (input_thread_t *)vlc_object_find( p_access, VLC_OBJECT_INPUT,
+ FIND_PARENT );
+ if( p_input )
+ {
+ stats_UpdateInteger( p_input, p_input->p->counters.p_sout_sent_packets,
+ 30, NULL );
+ stats_UpdateInteger( p_input, p_input->p->counters.p_sout_sent_bytes,
+ p_access->i_sent_bytes, &i_total );
+ stats_UpdateFloat( p_input, p_input->p->counters.p_sout_send_bitrate,
+ (float)i_total, NULL );
+ p_access->i_sent_bytes = 0;
+ vlc_object_release( p_input );
+ }
+ }
+ return p_access->pf_write( p_access, p_buffer );
}
+/**
+ * sout_AccessOutControl
+ */
+int sout_AccessOutControl (sout_access_out_t *access, int query, va_list args)
+{
+ return (access->pf_control) ? access->pf_control (access, query, args)
+ : VLC_EGENERIC;
+}
/*****************************************************************************
- * MuxNew: allocate a new mux
+ * sout_MuxNew: create a new mux
*****************************************************************************/
-sout_mux_t * sout_MuxNew ( sout_instance_t *p_sout,
- char *psz_mux,
- sout_access_out_t *p_access )
+sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, char *psz_mux,
+ sout_access_out_t *p_access )
{
sout_mux_t *p_mux;
char *psz_next;
- p_mux = vlc_object_create( p_sout,
- sizeof( sout_mux_t ) );
+ p_mux = vlc_object_create( p_sout, sizeof( sout_mux_t ) );
if( p_mux == NULL )
{
msg_Err( p_sout, "out of memory" );
return NULL;
}
- p_mux->p_sout = p_sout;
- psz_next = sout_cfg_parser( &p_mux->psz_mux, &p_mux->p_cfg, psz_mux );
- if( psz_next )
- {
- free( psz_next );
- }
+ p_mux->p_sout = p_sout;
+ psz_next = config_ChainCreate( &p_mux->psz_mux, &p_mux->p_cfg, psz_mux );
+ if( psz_next ) free( psz_next );
+
p_mux->p_access = p_access;
- p_mux->i_preheader = 0;
- p_mux->pf_capacity = NULL;
+ p_mux->pf_control = NULL;
p_mux->pf_addstream = NULL;
p_mux->pf_delstream = NULL;
p_mux->pf_mux = NULL;
p_mux->pp_inputs = NULL;
p_mux->p_sys = NULL;
+ p_mux->p_module = NULL;
- p_mux->p_module =
- module_NeedStrict( p_mux, "sout mux", p_mux->psz_mux );
+ p_mux->b_add_stream_any_time = VLC_FALSE;
+ p_mux->b_waiting_stream = VLC_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 );
if( p_mux->p_module == NULL )
{
- FREE( p_mux->psz_mux );
+ FREENULL( p_mux->psz_mux );
+ vlc_object_detach( p_mux );
vlc_object_destroy( p_mux );
return NULL;
}
/* *** probe mux capacity *** */
- if( p_mux->pf_capacity )
+ if( p_mux->pf_control )
{
- int b_answer;
- if( p_mux->pf_capacity( p_mux,
- SOUT_MUX_CAP_GET_ADD_STREAM_ANY_TIME,
- NULL, (void*)&b_answer ) != SOUT_MUX_CAP_ERR_OK )
+ int b_answer = VLC_FALSE;
+
+ if( sout_MuxControl( p_mux, MUX_CAN_ADD_STREAM_WHILE_MUXING,
+ &b_answer ) )
{
b_answer = VLC_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;
- }
- else
- {
- p_mux->b_add_stream_any_time = VLC_FALSE;
- p_mux->b_waiting_stream = VLC_TRUE;
+
+ /* 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;
+ }
+ else if( sout_MuxControl( p_mux, MUX_GET_ADD_STREAM_WAIT,
+ &b_answer ) )
+ {
+ b_answer = VLC_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;
+ }
}
}
- else
- {
- p_mux->b_add_stream_any_time = VLC_FALSE;
- p_mux->b_waiting_stream = VLC_TRUE;
- }
- p_mux->i_add_stream_start = -1;
return p_mux;
}
-void sout_MuxDelete ( sout_mux_t *p_mux )
+/*****************************************************************************
+ * sout_MuxDelete:
+ *****************************************************************************/
+void sout_MuxDelete( sout_mux_t *p_mux )
{
+ vlc_object_detach( p_mux );
if( p_mux->p_module )
{
module_Unneed( p_mux, p_mux->p_module );
}
free( p_mux->psz_mux );
- sout_cfg_free( p_mux->p_cfg );
+ config_ChainDestroy( p_mux->p_cfg );
vlc_object_destroy( p_mux );
}
-sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux,
- sout_format_t *p_fmt )
+/*****************************************************************************
+ * sout_MuxAddStream:
+ *****************************************************************************/
+sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux, es_format_t *p_fmt )
{
sout_input_t *p_input;
- if( !p_mux->b_add_stream_any_time && !p_mux->b_waiting_stream)
+ if( !p_mux->b_add_stream_any_time && !p_mux->b_waiting_stream )
{
- msg_Err( p_mux, "cannot add a new stream (unsuported while muxing for this format)" );
+ msg_Err( p_mux, "cannot add a new stream (unsupported while muxing "
+ "to this format)" );
return NULL;
}
- if( p_mux->i_add_stream_start < 0 )
- {
- /* we wait for one second */
- p_mux->i_add_stream_start = mdate();
- }
msg_Dbg( p_mux, "adding a new input" );
p_input = malloc( sizeof( sout_input_t ) );
p_input->p_sout = p_mux->p_sout;
p_input->p_fmt = p_fmt;
- p_input->p_fifo = sout_FifoCreate( p_mux->p_sout );
+ p_input->p_fifo = block_FifoNew( p_mux->p_sout );
p_input->p_sys = NULL;
TAB_APPEND( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input );
{
msg_Err( p_mux, "cannot add this stream" );
TAB_REMOVE( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input );
- sout_FifoDestroy( p_mux->p_sout, p_input->p_fifo );
+ block_FifoRelease( p_input->p_fifo );
free( p_input );
- return( NULL );
+ return NULL;
}
- return( p_input );
+ return p_input;
}
-void sout_MuxDeleteStream ( sout_mux_t *p_mux,
- sout_input_t *p_input )
+/*****************************************************************************
+ * sout_MuxDeleteStream:
+ *****************************************************************************/
+void sout_MuxDeleteStream( sout_mux_t *p_mux, sout_input_t *p_input )
{
int i_index;
+ if( p_mux->b_waiting_stream && p_input->p_fifo->i_depth > 0 )
+ {
+ /* 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->pf_mux( p_mux );
+ }
+
TAB_FIND( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input, i_index );
if( i_index >= 0 )
{
if( p_mux->pf_delstream( p_mux, p_input ) < 0 )
{
- msg_Err( p_mux, "cannot del this stream from mux" );
+ msg_Err( p_mux, "cannot delete this stream from mux" );
}
/* remove the entry */
if( p_mux->i_nb_inputs == 0 )
{
- msg_Warn( p_mux, "no more input stream for this mux" );
+ msg_Warn( p_mux, "no more input streams for this mux" );
}
- sout_FifoDestroy( p_mux->p_sout, p_input->p_fifo );
+ block_FifoRelease( p_input->p_fifo );
free( p_input );
}
}
-void sout_MuxSendBuffer ( sout_mux_t *p_mux,
- sout_input_t *p_input,
- sout_buffer_t *p_buffer )
+/*****************************************************************************
+ * sout_MuxSendBuffer:
+ *****************************************************************************/
+void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input,
+ block_t *p_buffer )
{
- sout_FifoPut( p_input->p_fifo, p_buffer );
+ block_FifoPut( p_input->p_fifo, p_buffer );
+
+ if( p_mux->p_sout->i_out_pace_nocontrol )
+ {
+ mtime_t current_date = mdate();
+ if ( current_date > p_buffer->i_dts )
+ msg_Warn( p_mux, "late buffer for mux input ("I64Fd")",
+ current_date - p_buffer->i_dts );
+ }
if( p_mux->b_waiting_stream )
{
- if( p_mux->i_add_stream_start > 0 &&
- p_mux->i_add_stream_start + (mtime_t)1500000 < mdate() )
+ if( p_mux->i_add_stream_start < 0 )
+ {
+ p_mux->i_add_stream_start = p_buffer->i_dts;
+ }
+
+ if( p_mux->i_add_stream_start >= 0 &&
+ p_mux->i_add_stream_start + I64C(1500000) < p_buffer->i_dts )
{
- /* more than 1.5 second, start muxing */
+ /* Wait until we have more than 1.5 seconds worth of data
+ * before start muxing */
p_mux->b_waiting_stream = VLC_FALSE;
}
else
p_mux->pf_mux( p_mux );
}
-
-
-sout_fifo_t *sout_FifoCreate( sout_instance_t *p_sout )
-{
- sout_fifo_t *p_fifo;
-
- if( !( p_fifo = malloc( sizeof( sout_fifo_t ) ) ) )
- {
- return( NULL );
- }
-
- vlc_mutex_init( p_sout, &p_fifo->lock );
- vlc_cond_init ( p_sout, &p_fifo->wait );
- p_fifo->i_depth = 0;
- p_fifo->p_first = NULL;
- p_fifo->pp_last = &p_fifo->p_first;
-
- return( p_fifo );
-}
-
-void sout_FifoFree( sout_instance_t *p_sout, sout_fifo_t *p_fifo )
-{
- sout_buffer_t *p_buffer;
-
- vlc_mutex_lock( &p_fifo->lock );
- p_buffer = p_fifo->p_first;
- while( p_buffer )
- {
- sout_buffer_t *p_next;
- p_next = p_buffer->p_next;
- sout_BufferDelete( p_sout, p_buffer );
- p_buffer = p_next;
- }
- vlc_mutex_unlock( &p_fifo->lock );
-
- return;
-}
-void sout_FifoDestroy( sout_instance_t *p_sout, sout_fifo_t *p_fifo )
-{
- sout_FifoFree( p_sout, p_fifo );
- vlc_mutex_destroy( &p_fifo->lock );
- vlc_cond_destroy ( &p_fifo->wait );
-
- free( p_fifo );
-}
-
-void sout_FifoPut( sout_fifo_t *p_fifo, sout_buffer_t *p_buffer )
-{
- vlc_mutex_lock( &p_fifo->lock );
-
- do
- {
- *p_fifo->pp_last = p_buffer;
- p_fifo->pp_last = &p_buffer->p_next;
- p_fifo->i_depth++;
-
- p_buffer = p_buffer->p_next;
-
- } while( p_buffer );
-
- /* warm there is data in this fifo */
- vlc_cond_signal( &p_fifo->wait );
- vlc_mutex_unlock( &p_fifo->lock );
-}
-
-sout_buffer_t *sout_FifoGet( sout_fifo_t *p_fifo )
-{
- sout_buffer_t *p_buffer;
-
- vlc_mutex_lock( &p_fifo->lock );
-
- if( p_fifo->p_first == NULL )
- {
- vlc_cond_wait( &p_fifo->wait, &p_fifo->lock );
- }
-
- p_buffer = p_fifo->p_first;
-
- p_fifo->p_first = p_buffer->p_next;
- p_fifo->i_depth--;
-
- if( p_fifo->p_first == NULL )
- {
- p_fifo->pp_last = &p_fifo->p_first;
- }
-
- vlc_mutex_unlock( &p_fifo->lock );
-
- p_buffer->p_next = NULL;
- return( p_buffer );
-}
-
-sout_buffer_t *sout_FifoShow( sout_fifo_t *p_fifo )
-{
- sout_buffer_t *p_buffer;
-
- vlc_mutex_lock( &p_fifo->lock );
-
- if( p_fifo->p_first == NULL )
- {
- vlc_cond_wait( &p_fifo->wait, &p_fifo->lock );
- }
-
- p_buffer = p_fifo->p_first;
-
- vlc_mutex_unlock( &p_fifo->lock );
-
- return( p_buffer );
-}
-
-sout_buffer_t *sout_BufferNew( sout_instance_t *p_sout, size_t i_size )
-{
- sout_buffer_t *p_buffer;
- size_t i_preheader, i_padding;
-
- p_buffer = malloc( sizeof( sout_buffer_t ) );
- i_preheader = p_sout->i_preheader;
- i_padding = p_sout->i_padding;
-
-#ifdef DEBUG_BUFFER
- msg_Dbg( p_sout, "allocating an new buffer, size:%d, preheader:%d, "
- "padding:%d", (uint32_t)i_size, i_preheader, i_padding );
-#endif
-
- if( i_size > 0 )
- {
- p_buffer->p_allocated_buffer =
- malloc( i_size + i_preheader + i_padding );
- p_buffer->p_buffer = p_buffer->p_allocated_buffer + i_preheader;
-
- if( p_buffer->p_allocated_buffer && i_padding )
- memset( p_buffer->p_allocated_buffer + i_size + i_preheader, 0,
- i_padding );
- }
- else
- {
- p_buffer->p_allocated_buffer = NULL;
- p_buffer->p_buffer = NULL;
- }
- p_buffer->i_allocated_size = i_size + i_preheader + i_padding;
- p_buffer->i_buffer_size = i_size;
-
- p_buffer->i_size = i_size;
- p_buffer->i_length = 0;
- p_buffer->i_dts = 0;
- p_buffer->i_pts = 0;
- p_buffer->i_bitrate = 0;
- p_buffer->i_flags = 0x0000;
- p_buffer->p_next = NULL;
-
- return( p_buffer );
-}
-
-int sout_BufferRealloc( sout_instance_t *p_sout, sout_buffer_t *p_buffer,
- size_t i_size )
-{
- size_t i_preheader, i_padding;
-
- i_preheader = p_buffer->p_buffer - p_buffer->p_allocated_buffer;
- i_padding = p_buffer->i_allocated_size - p_buffer->i_buffer_size
- - i_preheader;
-
-#ifdef DEBUG_BUFFER
- msg_Dbg( p_sout, "realloc buffer old size:%d new size:%d, preheader:%d, "
- "padding:%d", (uint32_t)p_buffer->i_allocated_size,
- (uint32_t)i_size, i_preheader, i_padding );
-#endif
-
- if( !( p_buffer->p_allocated_buffer =
- realloc( p_buffer->p_allocated_buffer,
- i_size + i_preheader + i_padding ) ) )
- {
- msg_Err( p_sout, "realloc failed" );
- p_buffer->i_allocated_size = 0;
- p_buffer->i_buffer_size = 0;
- p_buffer->i_size = 0;
- p_buffer->p_buffer = NULL;
- return( -1 );
- }
- p_buffer->p_buffer = p_buffer->p_allocated_buffer + i_preheader;
-
- p_buffer->i_allocated_size = i_size + i_preheader + i_padding;
- p_buffer->i_buffer_size = i_size;
-
- if( i_padding )
- memset( p_buffer->p_allocated_buffer + i_size + i_preheader, 0,
- i_padding );
-
- return( 0 );
-}
-
-int sout_BufferReallocFromPreHeader( sout_instance_t *p_sout,
- sout_buffer_t *p_buffer, size_t i_size )
-{
- size_t i_preheader;
-
- i_preheader = p_buffer->p_buffer - p_buffer->p_allocated_buffer;
-
- if( i_preheader < i_size )
- {
- return( -1 );
- }
-
- p_buffer->p_buffer -= i_size;
- p_buffer->i_size += i_size;
- p_buffer->i_buffer_size += i_size;
-
- return( 0 );
-}
-
-int sout_BufferDelete( sout_instance_t *p_sout, sout_buffer_t *p_buffer )
-{
-#ifdef DEBUG_BUFFER
- msg_Dbg( p_sout, "freeing buffer, size:%d", p_buffer->i_size );
-#endif
- if( p_buffer->p_allocated_buffer )
- {
- free( p_buffer->p_allocated_buffer );
- }
- free( p_buffer );
- return( 0 );
-}
-
-sout_buffer_t *sout_BufferDuplicate( sout_instance_t *p_sout,
- sout_buffer_t *p_buffer )
-{
- sout_buffer_t *p_dup;
-
- p_dup = sout_BufferNew( p_sout, p_buffer->i_size );
-
- p_dup->i_bitrate= p_buffer->i_bitrate;
- p_dup->i_dts = p_buffer->i_dts;
- p_dup->i_pts = p_buffer->i_pts;
- p_dup->i_length = p_buffer->i_length;
- p_dup->i_flags = p_buffer->i_flags;
- p_sout->p_vlc->pf_memcpy( p_dup->p_buffer, p_buffer->p_buffer, p_buffer->i_size );
-
- return( p_dup );
-}
-
-void sout_BufferChain( sout_buffer_t **pp_chain,
- sout_buffer_t *p_buffer )
-{
- if( *pp_chain == NULL )
- {
- *pp_chain = p_buffer;
- }
- else if( p_buffer != NULL )
- {
- sout_buffer_t *p = *pp_chain;
-
- while( p->p_next )
- {
- p = p->p_next;
- }
-
- p->p_next = p_buffer;
- }
-}
-
-static int mrl_Parse( mrl_t *p_mrl, char *psz_mrl )
+/*****************************************************************************
+ *
+ *****************************************************************************/
+static int mrl_Parse( mrl_t *p_mrl, const char *psz_mrl )
{
char * psz_dup = strdup( psz_mrl );
char * psz_parser = psz_dup;
- char * psz_access = "";
- char * psz_way = "";
- char * psz_name = "";
+ const char * psz_access;
+ const char * psz_way;
+ char * psz_name;
/* *** first parse psz_dest */
while( *psz_parser && *psz_parser != ':' )
/* mrl_Clean: clean p_mrl after a call to mrl_Parse */
static void mrl_Clean( mrl_t *p_mrl )
{
- FREE( p_mrl->psz_access );
- FREE( p_mrl->psz_way );
- FREE( p_mrl->psz_name );
+ FREENULL( p_mrl->psz_access );
+ FREENULL( p_mrl->psz_way );
+ FREENULL( p_mrl->psz_name );
}
module{option=*:option=*}[:module{option=*:...}]
*/
-static char *_strndup( char *str, int i_len )
-{
- char *p;
-
- p = malloc( i_len + 1 );
- strncpy( p, str, i_len );
- p[i_len] = '\0';
-
- return( p );
-}
-
/*
* parse module{options=str, option="str "}:
* 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 *p = str;
+ char c, *p = str;
SKIPSPACE( p );
for( ;; )
{
- if( *p == '{' || *p == '"' || *p == '\'')
- {
- char c;
-
- if( *p == '{' )
- {
- c = '}';
- }
- else
- {
- c = *p;
- }
- p++;
-
- for( ;; )
- {
- if( *p == '\0' )
- {
- return p;
- }
+ if( !*p || *p == ',' || *p == '}' ) return p;
- if( *p == c )
- {
- p++;
- return p;
- }
- else if( *p == '{' && c == '}' )
- {
- p = _get_chain_end( p );
- }
- else
- {
- p++;
- }
- }
- }
- else if( *p == '\0' || *p == ',' || *p == '}' || *p == ' ' || *p == '\t' )
- {
- return p;
- }
- else
+ if( *p != '{' && *p != '"' && *p != '\'' )
{
p++;
+ continue;
}
- }
-}
-
-char * sout_cfg_parser( char **ppsz_name, sout_cfg_t **pp_cfg, char *psz_chain )
-{
- sout_cfg_t *p_cfg = NULL;
- char *p = psz_chain;
-
- *ppsz_name = NULL;
- *pp_cfg = NULL;
-
- if( p == NULL )
- {
- return NULL;
- }
-
- SKIPSPACE( p );
-
- while( *p && *p != '{' && *p != ':' && *p != ' ' && *p != '\t' )
- {
- p++;
- }
-
- if( p == psz_chain )
- {
- return NULL;
- }
-
- *ppsz_name = _strndup( psz_chain, p - psz_chain );
-
- /* fprintf( stderr, "name=%s - rest=%s\n", *ppsz_name, p ); */
-
- SKIPSPACE( p );
-
- if( *p == '{' )
- {
- char *psz_name;
+ if( *p == '{' ) c = '}';
+ else c = *p;
p++;
for( ;; )
{
- sout_cfg_t cfg;
+ if( !*p ) return p;
- SKIPSPACE( p );
-
- psz_name = p;
-
- while( *p && *p != '=' && *p != ',' && *p != '}' && *p != ' ' && *p != '\t' )
- {
- p++;
- }
-
- /* fprintf( stderr, "name=%s - rest=%s\n", psz_name, p ); */
- if( p == psz_name )
- {
- fprintf( stderr, "invalid options (empty)" );
- break;
- }
-
- cfg.psz_name = _strndup( psz_name, p - psz_name );
-
- SKIPSPACE( p );
-
- if( *p == '=' )
- {
- char *end;
-
- p++;
-#if 0
- SKIPSPACE( p );
-
- if( *p == '"' )
- {
- char *end;
-
- p++;
- end = strchr( p, '"' );
-
- if( end )
- {
-/* fprintf( stderr, "##%s -- %s\n", p, end ); */
- cfg.psz_value = _strndup( p, end - p );
- p = end + 1;
- }
- else
- {
- cfg.psz_value = strdup( p );
- p += strlen( p );
- }
-
- }
- else
- {
- psz_value = p;
- while( *p && *p != ',' && *p != '}' && *p != ' ' && *p != '\t' )
- {
- p++;
- }
- cfg.psz_value = _strndup( psz_value, p - psz_value );
- }
-#endif
- end = _get_chain_end( p );
- if( end <= p )
- {
- cfg.psz_value = NULL;
- }
- else
- {
- if( *p == '\'' || *p =='"' || *p == '{' )
- {
- p++;
- end--;
- }
- if( end <= p )
- {
- cfg.psz_value = NULL;
- }
- else
- {
- cfg.psz_value = _strndup( p, end - p );
- }
- }
-
- p = end;
- SKIPSPACE( p );
- }
- else
- {
- cfg.psz_value = NULL;
- }
-
- cfg.p_next = NULL;
- if( p_cfg )
- {
- p_cfg->p_next = malloc( sizeof( sout_cfg_t ) );
- memcpy( p_cfg->p_next, &cfg, sizeof( sout_cfg_t ) );
-
- p_cfg = p_cfg->p_next;
- }
- else
- {
- p_cfg = malloc( sizeof( sout_cfg_t ) );
- memcpy( p_cfg, &cfg, sizeof( sout_cfg_t ) );
-
- *pp_cfg = p_cfg;
- }
-
- if( *p == ',' )
- {
- p++;
- }
-
- if( *p == '}' )
- {
- p++;
-
- break;
- }
+ if( *p == c ) return ++p;
+ else if( *p == '{' && c == '}' ) p = _get_chain_end( p );
+ else p++;
}
}
-
- if( *p == ':' )
- {
- return( strdup( p + 1 ) );
- }
-
- return( NULL );
-}
-
-static void sout_cfg_free( sout_cfg_t *p_cfg )
-{
- while( p_cfg != NULL )
- {
- sout_cfg_t *p_next;
-
- p_next = p_cfg->p_next;
-
- FREE( p_cfg->psz_name );
- FREE( p_cfg->psz_value );
- free( p_cfg );
-
- p_cfg = p_next;
- }
}
-
/*
* XXX name and p_cfg are used (-> do NOT free them)
*/
-sout_stream_t *sout_stream_new( sout_instance_t *p_sout,
- char *psz_chain )
+sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_chain )
{
sout_stream_t *p_stream;
p_stream->p_sys = NULL;
p_stream->psz_next =
- sout_cfg_parser( &p_stream->psz_name, &p_stream->p_cfg, psz_chain);
+ config_ChainCreate( &p_stream->psz_name, &p_stream->p_cfg, psz_chain);
msg_Dbg( p_sout, "stream=`%s'", p_stream->psz_name );
+ vlc_object_attach( p_stream, p_sout );
+
p_stream->p_module =
- module_NeedStrict( p_stream, "sout stream", p_stream->psz_name );
+ module_Need( p_stream, "sout stream", p_stream->psz_name, VLC_TRUE );
if( !p_stream->p_module )
{
- sout_stream_delete( p_stream );
+ sout_StreamDelete( p_stream );
return NULL;
}
return p_stream;
}
-void sout_stream_delete( sout_stream_t *p_stream )
+void sout_StreamDelete( sout_stream_t *p_stream )
{
msg_Dbg( p_stream, "destroying chain... (name=%s)", p_stream->psz_name );
+
+ vlc_object_detach( p_stream );
if( p_stream->p_module ) module_Unneed( p_stream, p_stream->p_module );
- FREE( p_stream->psz_name );
- FREE( p_stream->psz_next );
+ FREENULL( p_stream->psz_name );
+ FREENULL( p_stream->psz_next );
- sout_cfg_free( p_stream->p_cfg );
+ config_ChainDestroy( p_stream->p_cfg );
msg_Dbg( p_stream, "destroying chain done" );
vlc_object_destroy( p_stream );
{
mrl_t mrl;
char *psz_chain, *p;
- char *psz_vcodec, *psz_acodec;
mrl_Parse( &mrl, psz_url );
- p = psz_chain = malloc( 500 + strlen( mrl.psz_way ) + strlen( mrl.psz_access ) + strlen( mrl.psz_name ) );
-
- psz_vcodec = config_GetPsz( p_this, "sout-vcodec" );
- if( psz_vcodec && *psz_vcodec == '\0')
- {
- FREE( psz_vcodec );
- }
- psz_acodec = config_GetPsz( p_this, "sout-acodec" );
- if( psz_acodec && *psz_acodec == '\0' )
- {
- FREE( psz_acodec );
- }
- /* set transcoding */
- if( psz_vcodec || psz_acodec )
- {
- p += sprintf( p, "transcode{" );
- if( psz_vcodec )
- {
- int br;
-
- p += sprintf( p, "vcodec=%s,", psz_vcodec );
-
- if( ( br = config_GetInt( p_this, "sout-vbitrate" ) ) > 0 )
- {
- p += sprintf( p, "vb=%d,", br * 1000 );
- }
- free( psz_vcodec );
- }
- if( psz_acodec )
- {
- int br;
-
- p += sprintf( p, "acodec=%s,", psz_acodec );
- if( ( br = config_GetInt( p_this, "sout-abitrate" ) ) > 0 )
- {
- p += sprintf( p, "ab=%d,", br * 1000 );
- }
-
- free( psz_acodec );
- }
- p += sprintf( p, "}:" );
- }
+ p = psz_chain = malloc( 500 + strlen( mrl.psz_way ) +
+ strlen( mrl.psz_access ) +
+ strlen( mrl.psz_name ) );
if( config_GetInt( p_this, "sout-display" ) )
{
- p += sprintf( p, "duplicate{dst=display,dst=std{mux=\"%s\",access=\"%s\",url=\"%s\"}}", mrl.psz_way, mrl.psz_access, mrl.psz_name );
+ p += sprintf( p, "duplicate{dst=display,dst=std{mux=\"%s\","
+ "access=\"%s\",dst=\"%s\"}}",
+ mrl.psz_way, mrl.psz_access, mrl.psz_name );
}
else
{
- p += sprintf( p, "std{mux=\"%s\",access=\"%s\",url=\"%s\"}", mrl.psz_way, mrl.psz_access, mrl.psz_name );
+ p += sprintf( p, "std{mux=\"%s\",access=\"%s\",dst=\"%s\"}",
+ mrl.psz_way, mrl.psz_access, mrl.psz_name );
}
mrl_Clean( &mrl );
return( psz_chain );
}
-
-/*****************************************************************************/
-static module_t *__module_NeedStrict( vlc_object_t *p_obj, const char *psz_capacity, const char *psz_name )
-{
- module_t *p_module;
-
- if( !psz_name || !*psz_name )
- {
- p_module = module_Need( p_obj, psz_capacity, psz_name );
- }
- else
- {
- char *psz_name_strict = malloc( strlen( psz_name ) + 6 );
- strcpy( psz_name_strict, psz_name );
- strcat( psz_name_strict, ",none" );
-
- p_module = module_Need( p_obj, psz_capacity, psz_name_strict );
-
- free( psz_name_strict );
- }
-
- return p_module;
-}
-
-
projects / vlc / blobdiff