/*****************************************************************************
* stream_output.c : stream output module
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: stream_output.c,v 1.23 2003/03/31 03:46:11 fenrir Exp $
+ * Copyright (C) 2002-2004 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/input.h>
+
+#include "vlc_meta.h"
+
#undef DEBUG_BUFFER
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int InstanceNewOutput ( sout_instance_t *, char * );
-static int InstanceMuxNew ( sout_instance_t *,
- char *, char *, char * );
-
-static sout_mux_t * MuxNew ( sout_instance_t*,
- char *, sout_access_out_t * );
-static sout_input_t *MuxAddStream ( sout_mux_t *, sout_packet_format_t * );
-static void MuxDeleteStream ( sout_mux_t *, sout_input_t * );
-static void MuxDelete ( sout_mux_t * );
+static void sout_CfgDestroy( sout_cfg_t * );
-#if 0
-typedef struct
-{
- /* if muxer doesn't support adding stream at any time then we first wait
- * for stream then we refuse all stream and start muxing */
- vlc_bool_t b_add_stream_any_time;
- vlc_bool_t b_waiting_stream;
-
- /* we wait one second after first stream added */
- mtime_t i_add_stream_start;
-
-} sout_instance_sys_mux_t;
-#endif
-
-struct sout_instance_sys_t
-{
- int i_d_u_m_m_y;
-};
+#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 * );
/*
* Generic MRL parser
*
*/
-/* <access>{options}/<way>{options}://<name> */
-typedef struct mrl_option_s
-{
- struct mrl_option_s *p_next;
-
- char *psz_name;
- char *psz_value;
-} mrl_option_t;
typedef struct
{
- char *psz_access;
- mrl_option_t *p_access_options;
-
- char *psz_way;
- mrl_option_t *p_way_options;
-
+ char *psz_access;
+ char *psz_way;
char *psz_name;
} mrl_t;
/* mrl_Clean: clean p_mrl after a call to mrl_Parse */
static void mrl_Clean( mrl_t *p_mrl );
-/* some macro */
-#define TAB_APPEND( count, tab, p ) \
- if( (count) > 0 ) \
- { \
- (tab) = realloc( (tab), sizeof( void ** ) * ( (count) + 1 ) ); \
- } \
- else \
- { \
- (tab) = malloc( sizeof( void ** ) ); \
- } \
- (void**)(tab)[(count)] = (void*)(p); \
- (count)++
-
-#define TAB_FIND( count, tab, p, index ) \
- { \
- int _i_; \
- (index) = -1; \
- for( _i_ = 0; _i_ < (count); _i_++ ) \
- { \
- if((void**)(tab)[_i_]==(void*)(p)) \
- { \
- (index) = _i_; \
- break; \
- } \
- } \
- }
-
-#define TAB_REMOVE( count, tab, p ) \
- { \
- int i_index; \
- TAB_FIND( count, tab, p, i_index ); \
- if( i_index >= 0 ) \
- { \
- if( count > 1 ) \
- { \
- memmove( ((void**)tab + i_index), \
- ((void**)tab + i_index+1), \
- ( (count) - i_index - 1 ) * sizeof( void* ) );\
- } \
- else \
- { \
- free( tab ); \
- (tab) = NULL; \
- } \
- (count)--; \
- } \
- }
-
-#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;
- char *psz_dup, *psz_parser, *psz_pos;
+ vlc_value_t keep;
+
+ if( var_Get( p_parent, "sout-keep", &keep ) < 0 )
+ {
+ msg_Warn( p_parent, "cannot get sout-keep value" );
+ keep.b_bool = VLC_FALSE;
+ }
+ if( keep.b_bool )
+ {
+ if( ( p_sout = vlc_object_find( p_parent, VLC_OBJECT_SOUT,
+ FIND_ANYWHERE ) ) != NULL )
+ {
+ if( !strcmp( p_sout->psz_sout, psz_dest ) )
+ {
+ msg_Dbg( p_parent, "sout keep: reusing sout" );
+ msg_Dbg( p_parent, "sout keep: you probably want to use "
+ "gather stream_out" );
+ vlc_object_detach( p_sout );
+ vlc_object_attach( p_sout, p_parent );
+ vlc_object_release( p_sout );
+ return p_sout;
+ }
+ else
+ {
+ msg_Dbg( p_parent, "sout keep: destroying unusable sout" );
+ vlc_object_release( p_sout );
+ sout_DeleteInstance( p_sout );
+ }
+ }
+ }
+ else if( !keep.b_bool )
+ {
+ while( ( p_sout = vlc_object_find( p_parent, VLC_OBJECT_SOUT,
+ FIND_PARENT ) ) != NULL )
+ {
+ msg_Dbg( p_parent, "sout keep: destroying old sout" );
+ vlc_object_release( p_sout );
+ sout_DeleteInstance( p_sout );
+ }
+ }
- /* Allocate descriptor */
+ /* *** Allocate descriptor *** */
p_sout = vlc_object_create( p_parent, VLC_OBJECT_SOUT );
if( p_sout == NULL )
{
return NULL;
}
- p_sout->psz_sout = NULL;
-
- p_sout->i_nb_dest = 0;
- p_sout->ppsz_dest = NULL;
-
- p_sout->i_preheader = 0;
- p_sout->i_nb_mux = 0;
- p_sout->pp_mux = 0;
+ /* *** init descriptor *** */
+ p_sout->psz_sout = strdup( psz_dest );
+ 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->i_nb_inputs = 0;
- p_sout->pp_inputs = NULL;
-
- p_sout->p_sys = malloc( sizeof( sout_instance_sys_t ) );
-
- /* now parse psz_sout */
- psz_dup = strdup( psz_dest );
- psz_parser = psz_dup;
-
- while( ( psz_pos = strchr( psz_parser, '#' ) ) != NULL )
+ if( psz_dest && psz_dest[0] == '#' )
{
- *psz_pos++ = '\0';
-
- if( InstanceNewOutput( p_sout, psz_parser ) )
- {
- msg_Err( p_sout, "adding `%s' failed", psz_parser );
- }
-
- psz_parser = psz_pos;
+ p_sout->psz_chain = strdup( &psz_dest[1] );
}
-
- if( *psz_parser )
+ else
{
- if( InstanceNewOutput( p_sout, psz_parser ) )
- {
- msg_Err( p_sout, "adding `%s' failed", psz_parser );
- }
+ 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;
- free( psz_dup );
+ /* 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->i_nb_dest <= 0 )
+ if( p_sout->p_stream == NULL )
{
- msg_Err( p_sout, "all sout failed" );
+ msg_Err( p_sout, "stream chain failed for `%s'", 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 )
{
- int i;
/* 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 );
+ FREENULL( p_sout->psz_sout );
+ FREENULL( p_sout->psz_chain );
- for( i = 0; i < p_sout->i_nb_dest; i++ )
+ /* delete meta */
+ if( p_sout->p_meta )
{
- FREE( p_sout->ppsz_dest[i] );
+ vlc_meta_Delete( p_sout->p_meta );
}
- FREE( p_sout->ppsz_dest );
- /* *** there shouldn't be any input ** */
- if( p_sout->i_nb_inputs > 0 )
- {
- msg_Err( p_sout, "i_nb_inputs=%d > 0 !!!!!!", p_sout->i_nb_inputs );
- msg_Err( p_sout, "mmmh I have a bad feeling..." );
- }
vlc_mutex_destroy( &p_sout->lock );
- /* *** remove all muxer *** */
- for( i = 0; i < p_sout->i_nb_mux; i++ )
- {
- sout_access_out_t *p_access;
-#define p_mux p_sout->pp_mux[i]
-
- p_access = p_mux->p_access;
-
- MuxDelete( p_mux );
- sout_AccessOutDelete( p_access );
-#undef p_mux
- }
- FREE( p_sout->pp_mux );
-
-#if 0
- for( i = 0; i < p_sout->p_sys->i_nb_mux; i++ )
- {
- FREE( p_sout->p_sys->pp_mux[i] );
- }
- FREE( p_sout->p_sys->pp_mux );
-#endif
-
- /* Free structure */
+ /* *** free structure *** */
vlc_object_destroy( p_sout );
}
-
-
/*****************************************************************************
- * InitInstance: opens appropriate modules
+ * Packetizer/Input
*****************************************************************************/
-static int InstanceNewOutput (sout_instance_t *p_sout, char *psz_dest )
+sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout,
+ es_format_t *p_fmt )
{
- mrl_t mrl;
- char * psz_dup;
-#if 0
- /* Parse dest string. Syntax : [[<access>][/<mux>]:][<dest>] */
- /* This code is identical to input.c:InitThread. FIXME : factorize it ? */
+ sout_packetizer_input_t *p_input;
- char * psz_dup = strdup( psz_dest );
- char * psz_parser = psz_dup;
- char * psz_access = "";
- char * psz_mux = "";
- char * psz_name = "";
- /* *** first parse psz_dest */
- while( *psz_parser && *psz_parser != ':' )
- {
- psz_parser++;
- }
-#if defined( WIN32 ) || defined( UNDER_CE )
- if( psz_parser - psz_dup == 1 )
- {
- msg_Warn( p_sout, "drive letter %c: found in source string",
- *psz_dup ) ;
- psz_parser = "";
- }
-#endif
+ msg_Dbg( p_sout, "adding a new input" );
- if( !*psz_parser )
+ /* *** create a packetizer input *** */
+ p_input = malloc( sizeof( sout_packetizer_input_t ) );
+ p_input->p_sout = p_sout;
+ p_input->p_fmt = p_fmt;
+
+ if( p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
{
- psz_access = psz_mux = "";
- psz_name = psz_dup;
+ vlc_object_release( p_sout );
+ return p_input;
}
- else
- {
- *psz_parser++ = '\0';
-
- /* let's skip '//' */
- if( psz_parser[0] == '/' && psz_parser[1] == '/' )
- {
- psz_parser += 2 ;
- }
-
- psz_name = psz_parser ;
-
- /* Come back to parse the access and mux plug-ins */
- psz_parser = psz_dup;
-
- if( !*psz_parser )
- {
- /* No access */
- psz_access = "";
- }
- else if( *psz_parser == '/' )
- {
- /* No access */
- psz_access = "";
- psz_parser++;
- }
- else
- {
- psz_access = psz_parser;
- while( *psz_parser && *psz_parser != '/' )
- {
- psz_parser++;
- }
-
- if( *psz_parser == '/' )
- {
- *psz_parser++ = '\0';
- }
- }
+ /* *** 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 );
+ vlc_mutex_unlock( &p_sout->lock );
- if( !*psz_parser )
- {
- /* No mux */
- psz_mux = "";
- }
- else
- {
- psz_mux = psz_parser;
- }
+ if( p_input->id == NULL )
+ {
+ free( p_input );
+ return NULL;
}
- msg_Dbg( p_sout, "access `%s', mux `%s', name `%s'",
- psz_access, psz_mux, psz_name );
-#endif
+ return( p_input );
+}
- mrl_Parse( &mrl, psz_dest );
- msg_Dbg( p_sout, "access `%s', mux `%s', name `%s'",
- mrl.psz_access, mrl.psz_way, mrl.psz_name );
+/*****************************************************************************
+ *
+ *****************************************************************************/
+int sout_InputDelete( sout_packetizer_input_t *p_input )
+{
+ sout_instance_t *p_sout = p_input->p_sout;
- vlc_mutex_lock( &p_sout->lock );
- /* *** create mux *** */
+ msg_Dbg( p_sout, "removing an input" );
- if( InstanceMuxNew( p_sout, mrl.psz_way, mrl.psz_access, mrl.psz_name ) )
+ if( p_input->p_fmt->i_codec != VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
{
- msg_Err( p_sout, "cannot create sout chain for %s/%s://%s",
- mrl.psz_access, mrl.psz_way, mrl.psz_name );
-
- mrl_Clean( &mrl );
+ vlc_mutex_lock( &p_sout->lock );
+ p_sout->p_stream->pf_del( p_sout->p_stream, p_input->id );
vlc_mutex_unlock( &p_sout->lock );
- return( VLC_EGENERIC );
- }
- mrl_Clean( &mrl );
-
- /* *** finish all setup *** */
- if( p_sout->psz_sout )
- {
- p_sout->psz_sout =
- realloc( p_sout->psz_sout,
- strlen( p_sout->psz_sout ) +2+1+ strlen( psz_dest ) );
- strcat( p_sout->psz_sout, "#" );
- strcat( p_sout->psz_sout, psz_dest );
- }
- else
- {
- p_sout->psz_sout = strdup( psz_dest );
}
- psz_dup = strdup( psz_dest );
- TAB_APPEND( p_sout->i_nb_dest, p_sout->ppsz_dest, psz_dup );
- vlc_mutex_unlock( &p_sout->lock );
- msg_Dbg( p_sout, "complete sout `%s'", p_sout->psz_sout );
+ free( p_input );
- return VLC_SUCCESS;
+ return( VLC_SUCCESS);
}
-static int InstanceMuxNew ( sout_instance_t *p_sout,
- char *psz_mux, char *psz_access, char *psz_name )
+/*****************************************************************************
+ *
+ *****************************************************************************/
+int sout_InputSendBuffer( sout_packetizer_input_t *p_input,
+ block_t *p_buffer )
{
- sout_access_out_t *p_access;
- sout_mux_t *p_mux;
+ sout_instance_t *p_sout = p_input->p_sout;
+ int i_ret;
- /* *** find and open appropriate access module *** */
- p_access =
- sout_AccessOutNew( p_sout, psz_access, psz_name );
- if( p_access == NULL )
+ if( p_input->p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
{
- msg_Err( p_sout, "no suitable sout access module for `%s/%s://%s'",
- psz_access, psz_mux, psz_name );
- return( VLC_EGENERIC );
+ block_Release( p_buffer );
+ return VLC_SUCCESS;
}
-
- /* *** find and open appropriate mux module *** */
- p_mux = MuxNew( p_sout, psz_mux, p_access );
- if( p_mux == NULL )
+ if( p_buffer->i_dts <= 0 )
{
- msg_Err( p_sout, "no suitable sout mux module for `%s/%s://%s'",
- psz_access, psz_mux, psz_name );
-
- sout_AccessOutDelete( p_access );
- return( VLC_EGENERIC );
+ msg_Warn( p_sout, "trying to send non-dated packet to stream output!");
+ block_Release( p_buffer );
+ return VLC_SUCCESS;
}
- p_sout->i_preheader = __MAX( p_sout->i_preheader,
- p_mux->i_preheader );
-
- TAB_APPEND( p_sout->i_nb_mux, p_sout->pp_mux, p_mux );
-
+ vlc_mutex_lock( &p_sout->lock );
+ i_ret = p_sout->p_stream->pf_send( p_sout->p_stream,
+ p_input->id, p_buffer );
+ vlc_mutex_unlock( &p_sout->lock );
- return VLC_SUCCESS;
+ return i_ret;
}
+
/*****************************************************************************
* sout_AccessOutNew: allocate a new access out
*****************************************************************************/
char *psz_access, char *psz_name )
{
sout_access_out_t *p_access;
+ char *psz_next;
if( !( p_access = vlc_object_create( p_sout,
sizeof( sout_access_out_t ) ) ) )
msg_Err( p_sout, "out of memory" );
return NULL;
}
- p_access->psz_access = strdup( psz_access ? psz_access : "" );
+
+ psz_next = sout_CfgCreate( &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->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->p_module = NULL;
+
+ p_access->i_writes = 0;
+ p_access->i_sent_bytes = 0;
- p_access->p_module = module_Need( p_access,
- "sout access",
- p_access->psz_access );;
+ vlc_object_attach( p_access, p_sout );
+
+ p_access->p_module =
+ 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 );
+ 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_CfgDestroy( p_access->p_cfg );
+
free( p_access->psz_name );
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 ) );
-}
-
-
-
-static sout_input_t *SoutInputCreate( sout_instance_t *p_sout,
- sout_packet_format_t *p_format )
-{
- sout_input_t *p_input;
-
- p_input = malloc( sizeof( sout_input_t ) );
-
- p_input->p_sout = p_sout;
- memcpy( &p_input->input_format,
- p_format,
- sizeof( sout_packet_format_t ) );
- p_input->p_fifo = sout_FifoCreate( p_sout );
- p_input->p_sys = NULL;
-
- return p_input;
-}
-
-static void SoutInputDestroy( sout_instance_t *p_sout,
- sout_input_t *p_input )
-{
- sout_FifoDestroy( p_sout, p_input->p_fifo );
- free( p_input );
+ return( p_access->pf_read ?
+ p_access->pf_read( p_access, p_buffer ) : VLC_EGENERIC );
}
/*****************************************************************************
- * Mux*: create/destroy/manipulate muxer.
- * XXX: for now they are private, but I will near export them
- * to allow muxer creating private muxer (ogg in avi, flexmux in ts/ps)
+ * 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->counters.p_sout_sent_packets,
+ 30, NULL );
+ stats_UpdateInteger( p_input, p_input->counters.p_sout_sent_bytes,
+ p_access->i_sent_bytes, &i_total );
+ stats_UpdateFloat( p_input, p_input->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 );
+}
/*****************************************************************************
- * MuxNew: allocate a new mux
+ * sout_MuxNew: create a new mux
*****************************************************************************/
-static sout_mux_t * 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;
- p_mux->psz_mux = strdup( psz_mux);
+ p_mux->p_sout = p_sout;
+ psz_next = sout_CfgCreate( &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->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 );
- p_mux->p_module = module_Need( p_mux,
- "sout mux",
- p_mux->psz_mux );
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;
+
+ /* 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;
- }
- }
- 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;
}
-static void 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_CfgDestroy( p_mux->p_cfg );
+
vlc_object_destroy( p_mux );
}
-static sout_input_t *MuxAddStream ( sout_mux_t *p_mux,
- sout_packet_format_t *p_format )
+/*****************************************************************************
+ * 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" );
+
/* create a new sout input */
- p_input = SoutInputCreate( p_mux->p_sout, p_format );
+ 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 = block_FifoNew( p_mux->p_sout );
+ p_input->p_sys = NULL;
TAB_APPEND( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input );
if( p_mux->pf_addstream( p_mux, p_input ) < 0 )
{
msg_Err( p_mux, "cannot add this stream" );
- MuxDeleteStream( p_mux, p_input );
- return( NULL );
+ TAB_REMOVE( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input );
+ block_FifoRelease( p_input->p_fifo );
+ free( p_input );
+ return NULL;
}
- return( p_input );
+ return p_input;
}
-static void 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" );
}
- SoutInputDestroy( p_mux->p_sout, p_input );
+ block_FifoRelease( p_input->p_fifo );
+ free( p_input );
}
}
-static void 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
/*****************************************************************************
*
*****************************************************************************/
-sout_packetizer_input_t *__sout_InputNew( vlc_object_t *p_this,
- sout_packet_format_t *p_format )
+static int mrl_Parse( mrl_t *p_mrl, char *psz_mrl )
{
- sout_instance_t *p_sout = NULL;
- sout_packetizer_input_t *p_input;
- int i_try;
- int i_mux;
- vlc_bool_t b_accepted = VLC_FALSE;
+ char * psz_dup = strdup( psz_mrl );
+ char * psz_parser = psz_dup;
+ char * psz_access = "";
+ char * psz_way = "";
+ char * psz_name = "";
- /* search an stream output */
- for( i_try = 0; i_try < 12; i_try++ )
+ /* *** first parse psz_dest */
+ while( *psz_parser && *psz_parser != ':' )
{
- p_sout = vlc_object_find( p_this, VLC_OBJECT_SOUT, FIND_ANYWHERE );
- if( !p_sout )
+ if( *psz_parser == '{' )
{
- msleep( 100*1000 );
- msg_Dbg( p_this, "waiting for sout" );
+ while( *psz_parser && *psz_parser != '}' )
+ {
+ psz_parser++;
+ }
+ if( *psz_parser )
+ {
+ psz_parser++;
+ }
}
else
{
- break;
+ psz_parser++;
}
}
-
- if( !p_sout )
+#if defined( WIN32 ) || defined( UNDER_CE )
+ if( psz_parser - psz_dup == 1 )
{
- msg_Err( p_this, "cannot find any stream ouput" );
- return( NULL );
+ /* msg_Warn( p_sout, "drive letter %c: found in source string",
+ *psz_dup ) ; */
+ psz_parser = "";
}
- msg_Dbg( p_sout, "adding a new input" );
+#endif
- /* *** create a packetizer input *** */
- p_input = malloc( sizeof( sout_packetizer_input_t ) );
- p_input->p_sout = p_sout;
- p_input->i_nb_inputs = 0;
- p_input->pp_inputs = NULL;
- p_input->i_nb_mux = 0;
- p_input->pp_mux = NULL;
- memcpy( &p_input->input_format,
- p_format,
- sizeof( sout_packet_format_t ) );
-
- if( p_format->i_fourcc == VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
+ if( !*psz_parser )
{
- vlc_object_release( p_sout );
- return p_input;
+ psz_access = psz_way = "";
+ psz_name = psz_dup;
}
-
- vlc_mutex_lock( &p_sout->lock );
- /* *** add this input to all muxers *** */
- for( i_mux = 0; i_mux < p_sout->i_nb_mux; i_mux++ )
+ else
{
- sout_input_t *p_mux_input;
-#define p_mux p_sout->pp_mux[i_mux]
+ *psz_parser++ = '\0';
- p_mux_input = MuxAddStream( p_mux, p_format );
- if( p_mux_input )
+ /* let's skip '//' */
+ if( psz_parser[0] == '/' && psz_parser[1] == '/' )
{
- TAB_APPEND( p_input->i_nb_inputs, p_input->pp_inputs, p_mux_input );
- TAB_APPEND( p_input->i_nb_mux, p_input->pp_mux, p_mux );
-
- b_accepted = VLC_TRUE;
+ psz_parser += 2 ;
}
-#undef p_mux
- }
-
- if( !b_accepted )
- {
- /* all muxer refuse this stream, so delete it */
- free( p_input );
-
- vlc_mutex_unlock( &p_sout->lock );
- vlc_object_release( p_sout );
- return( NULL );
- }
-
- TAB_APPEND( p_sout->i_nb_inputs, p_sout->pp_inputs, p_input );
- vlc_mutex_unlock( &p_sout->lock );
-
- vlc_object_release( p_sout );
- return( p_input );
-}
+ psz_name = psz_parser ;
+ /* Come back to parse the access and mux plug-ins */
+ psz_parser = psz_dup;
-int sout_InputDelete( sout_packetizer_input_t *p_input )
-{
- sout_instance_t *p_sout = p_input->p_sout;
- int i_input;
+ if( !*psz_parser )
+ {
+ /* No access */
+ psz_access = "";
+ }
+ else if( *psz_parser == '/' )
+ {
+ /* No access */
+ psz_access = "";
+ psz_parser++;
+ }
+ else
+ {
+ psz_access = psz_parser;
- msg_Dbg( p_sout, "removing an input" );
+ while( *psz_parser && *psz_parser != '/' )
+ {
+ if( *psz_parser == '{' )
+ {
+ while( *psz_parser && *psz_parser != '}' )
+ {
+ psz_parser++;
+ }
+ if( *psz_parser )
+ {
+ psz_parser++;
+ }
+ }
+ else
+ {
+ psz_parser++;
+ }
+ }
- vlc_mutex_lock( &p_sout->lock );
+ if( *psz_parser == '/' )
+ {
+ *psz_parser++ = '\0';
+ }
+ }
- /* *** remove this input to all muxers *** */
- for( i_input = 0; i_input < p_input->i_nb_inputs; i_input++ )
- {
- MuxDeleteStream( p_input->pp_mux[i_input], p_input->pp_inputs[i_input] );
+ if( !*psz_parser )
+ {
+ /* No mux */
+ psz_way = "";
+ }
+ else
+ {
+ psz_way = psz_parser;
+ }
}
- TAB_REMOVE( p_sout->i_nb_inputs, p_sout->pp_inputs, p_input );
-
- free( p_input->pp_inputs );
- free( p_input->pp_mux );
-
- free( p_input );
+ p_mrl->psz_access = strdup( psz_access );
+ p_mrl->psz_way = strdup( psz_way );
+ p_mrl->psz_name = strdup( psz_name );
- vlc_mutex_unlock( &p_sout->lock );
- return( 0 );
+ free( psz_dup );
+ return( VLC_SUCCESS );
}
-int sout_InputSendBuffer( sout_packetizer_input_t *p_input, sout_buffer_t *p_buffer )
+/* mrl_Clean: clean p_mrl after a call to mrl_Parse */
+static void mrl_Clean( mrl_t *p_mrl )
{
-// sout_instance_sys_t *p_sys = p_input->p_sout->p_sys;
-/* msg_Dbg( p_input->p_sout,
- "send buffer, size:%d", p_buffer->i_size ); */
-
- if( p_input->input_format.i_fourcc != VLC_FOURCC( 'n', 'u', 'l', 'l' ) &&
- p_input->i_nb_inputs > 0 )
- {
- int i;
+ FREENULL( p_mrl->psz_access );
+ FREENULL( p_mrl->psz_way );
+ FREENULL( p_mrl->psz_name );
+}
- vlc_mutex_lock( &p_input->p_sout->lock );
- for( i = 0; i < p_input->i_nb_inputs - 1; i++ )
- {
- sout_buffer_t *p_dup;
- p_dup = sout_BufferDuplicate( p_input->p_sout, p_buffer );
+/****************************************************************************
+ ****************************************************************************
+ **
+ **
+ **
+ ****************************************************************************
+ ****************************************************************************/
- MuxSendBuffer( p_input->pp_mux[i],
- p_input->pp_inputs[i],
- p_dup );
- }
- MuxSendBuffer( p_input->pp_mux[p_input->i_nb_inputs-1],
- p_input->pp_inputs[p_input->i_nb_inputs-1],
- p_buffer );
+/* create a complete chain */
+/* chain format:
+ module{option=*:option=*}[:module{option=*:...}]
+ */
- vlc_mutex_unlock( &p_input->p_sout->lock );
- }
- else
- {
- sout_BufferDelete( p_input->p_sout, p_buffer );
- }
- return( 0 );
-}
+/*
+ * 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--; }
-sout_fifo_t *sout_FifoCreate( sout_instance_t *p_sout )
+/* go accross " " and { } */
+static char *_get_chain_end( char *str )
{
- sout_fifo_t *p_fifo;
+ char c, *p = str;
- if( !( p_fifo = malloc( sizeof( sout_fifo_t ) ) ) )
+ SKIPSPACE( p );
+
+ for( ;; )
{
- return( NULL );
- }
+ if( !*p || *p == ',' || *p == '}' ) return p;
- 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;
+ if( *p != '{' && *p != '"' && *p != '\'' )
+ {
+ p++;
+ continue;
+ }
- return( p_fifo );
-}
+ if( *p == '{' ) c = '}';
+ else c = *p;
+ p++;
-void sout_FifoFree( sout_instance_t *p_sout, sout_fifo_t *p_fifo )
-{
- sout_buffer_t *p_buffer;
+ for( ;; )
+ {
+ if( !*p ) return p;
- 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;
+ if( *p == c ) return ++p;
+ else if( *p == '{' && c == '}' ) p = _get_chain_end( p );
+ else p++;
+ }
}
- 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 )
+char *sout_CfgCreate( char **ppsz_name, sout_cfg_t **pp_cfg, char *psz_chain )
{
- vlc_mutex_lock( &p_fifo->lock );
+ sout_cfg_t *p_cfg = NULL;
+ char *p = psz_chain;
- do
- {
- *p_fifo->pp_last = p_buffer;
- p_fifo->pp_last = &p_buffer->p_next;
- p_fifo->i_depth++;
+ *ppsz_name = NULL;
+ *pp_cfg = NULL;
- p_buffer = p_buffer->p_next;
+ if( !p ) return NULL;
- } while( p_buffer );
+ SKIPSPACE( p );
- /* warm there is data in this fifo */
- vlc_cond_signal( &p_fifo->wait );
- vlc_mutex_unlock( &p_fifo->lock );
-}
+ while( *p && *p != '{' && *p != ':' && *p != ' ' && *p != '\t' ) p++;
-sout_buffer_t *sout_FifoGet( sout_fifo_t *p_fifo )
-{
- sout_buffer_t *p_buffer;
+ if( p == psz_chain ) return NULL;
- vlc_mutex_lock( &p_fifo->lock );
+ *ppsz_name = strndup( psz_chain, p - psz_chain );
- if( p_fifo->p_first == NULL )
- {
- vlc_cond_wait( &p_fifo->wait, &p_fifo->lock );
- }
-
- p_buffer = p_fifo->p_first;
+ SKIPSPACE( p );
- p_fifo->p_first = p_buffer->p_next;
- p_fifo->i_depth--;
-
- if( p_fifo->p_first == NULL )
+ if( *p == '{' )
{
- p_fifo->pp_last = &p_fifo->p_first;
- }
+ char *psz_name;
- vlc_mutex_unlock( &p_fifo->lock );
+ p++;
- p_buffer->p_next = NULL;
- return( p_buffer );
-}
+ for( ;; )
+ {
+ sout_cfg_t cfg;
-sout_buffer_t *sout_FifoShow( sout_fifo_t *p_fifo )
-{
- sout_buffer_t *p_buffer;
+ SKIPSPACE( p );
- vlc_mutex_lock( &p_fifo->lock );
+ psz_name = p;
- if( p_fifo->p_first == NULL )
- {
- vlc_cond_wait( &p_fifo->wait, &p_fifo->lock );
- }
+ while( *p && *p != '=' && *p != ',' && *p != '{' && *p != '}' &&
+ *p != ' ' && *p != '\t' ) p++;
- p_buffer = p_fifo->p_first;
+ /* fprintf( stderr, "name=%s - rest=%s\n", psz_name, p ); */
+ if( p == psz_name )
+ {
+ fprintf( stderr, "invalid options (empty)" );
+ break;
+ }
- vlc_mutex_unlock( &p_fifo->lock );
+ cfg.psz_name = strndup( psz_name, p - psz_name );
- return( p_buffer );
-}
+ SKIPSPACE( p );
-sout_buffer_t *sout_BufferNew( sout_instance_t *p_sout, size_t i_size )
-{
- sout_buffer_t *p_buffer;
- size_t i_preheader;
+ if( *p == '=' || *p == '{' )
+ {
+ char *end;
+ vlc_bool_t b_keep_brackets = (*p == '{');
-#ifdef DEBUG_BUFFER
- msg_Dbg( p_sout, "allocating an new buffer, size:%d", (uint32_t)i_size );
-#endif
+ if( *p == '=' ) p++;
- p_buffer = malloc( sizeof( sout_buffer_t ) );
- i_preheader = p_sout->i_preheader;
+ end = _get_chain_end( p );
+ if( end <= p )
+ {
+ cfg.psz_value = NULL;
+ }
+ else
+ {
+ /* Skip heading and trailing spaces.
+ * This ain't necessary but will avoid simple
+ * user mistakes. */
+ SKIPSPACE( p );
+ }
- if( i_size > 0 )
- {
- p_buffer->p_allocated_buffer = malloc( i_size + i_preheader );
- p_buffer->p_buffer = p_buffer->p_allocated_buffer + i_preheader;
- }
- else
- {
- p_buffer->p_allocated_buffer = NULL;
- p_buffer->p_buffer = NULL;
- }
- p_buffer->i_allocated_size = i_size + i_preheader;
- 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;
+ if( end <= p )
+ {
+ cfg.psz_value = NULL;
+ }
+ else
+ {
+ if( *p == '\'' || *p == '"' ||
+ ( !b_keep_brackets && *p == '{' ) )
+ {
+ p++;
-#ifdef DEBUG_BUFFER
- msg_Dbg( p_sout,
- "realloc buffer old size:%d new size:%d",
- (uint32_t)p_buffer->i_allocated_size,
- (uint32_t)i_size );
-#endif
+ if( *(end-1) != '\'' && *(end-1) == '"' )
+ SKIPTRAILINGSPACE( p, end );
- i_preheader = p_buffer->p_buffer - p_buffer->p_allocated_buffer;
+ if( end - 1 <= p ) cfg.psz_value = NULL;
+ else cfg.psz_value = strndup( p, end -1 - p );
+ }
+ else
+ {
+ SKIPTRAILINGSPACE( p, end );
+ if( end <= p ) cfg.psz_value = NULL;
+ else cfg.psz_value = strndup( p, end - p );
+ }
+ }
- if( !( p_buffer->p_allocated_buffer = realloc( p_buffer->p_allocated_buffer, i_size + i_preheader ) ) )
- {
- 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 = end;
+ SKIPSPACE( p );
+ }
+ else
+ {
+ cfg.psz_value = NULL;
+ }
- p_buffer->i_allocated_size = i_size + i_preheader;
- p_buffer->i_buffer_size = i_size;
+ 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 ) );
- return( 0 );
-}
+ p_cfg = p_cfg->p_next;
+ }
+ else
+ {
+ p_cfg = malloc( sizeof( sout_cfg_t ) );
+ memcpy( p_cfg, &cfg, sizeof( sout_cfg_t ) );
-int sout_BufferReallocFromPreHeader( sout_instance_t *p_sout, sout_buffer_t *p_buffer, size_t i_size )
-{
- size_t i_preheader;
+ *pp_cfg = p_cfg;
+ }
- i_preheader = p_buffer->p_buffer - p_buffer->p_allocated_buffer;
+ if( *p == ',' ) p++;
- if( i_preheader < i_size )
- {
- return( -1 );
+ if( *p == '}' )
+ {
+ p++;
+ break;
+ }
+ }
}
- p_buffer->p_buffer -= i_size;
- p_buffer->i_size += i_size;
- p_buffer->i_buffer_size += i_size;
+ if( *p == ':' ) return( strdup( p + 1 ) );
- return( 0 );
+ return NULL;
}
-int sout_BufferDelete( sout_instance_t *p_sout, sout_buffer_t *p_buffer )
+static void sout_CfgDestroy( sout_cfg_t *p_cfg )
{
-#ifdef DEBUG_BUFFER
- msg_Dbg( p_sout, "freeing buffer, size:%d", p_buffer->i_size );
-#endif
- if( p_buffer->p_allocated_buffer )
+ while( p_cfg != NULL )
{
- 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;
+ sout_cfg_t *p_next;
- p_dup = sout_BufferNew( p_sout, p_buffer->i_size );
+ p_next = p_cfg->p_next;
- 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 );
+ FREENULL( p_cfg->psz_name );
+ FREENULL( p_cfg->psz_value );
+ free( p_cfg );
- 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;
+ p_cfg = p_next;
}
}
-#if 0
-static int mrl_ParseOptions( mrl_option_t **pp_opt, char *psz_options )
+void __sout_CfgParse( vlc_object_t *p_this, char *psz_prefix,
+ const char **ppsz_options, sout_cfg_t *cfg )
{
- mrl_option_t **pp_last = pp_opt;
+ char *psz_name;
+ int i_type;
+ int i;
- char *psz_parser = strdup( psz_options );
+ /* First, var_Create all variables */
+ for( i = 0; ppsz_options[i] != NULL; i++ )
+ {
+ asprintf( &psz_name, "%s%s", psz_prefix,
+ *ppsz_options[i] == '*' ? &ppsz_options[i][1] : ppsz_options[i] );
- *pp_last = NULL;
+ i_type = config_GetType( p_this, psz_name );
- if( *psz_parser == '=' )
- {
- free( psz_parser );
- return( VLC_EGENERIC );
- }
- if( *psz_parser == '{' )
- {
- free( psz_parser );
+ var_Create( p_this, psz_name, i_type | VLC_VAR_DOINHERIT );
+ free( psz_name );
}
- for( ;; )
+ /* Now parse options and set value */
+ if( psz_prefix == NULL ) psz_prefix = "";
+
+ while( cfg )
{
- char *psz_end;
- mrl_option_t opt;
+ vlc_value_t val;
+ vlc_bool_t b_yes = VLC_TRUE;
+ vlc_bool_t b_once = VLC_FALSE;
+ module_config_t *p_conf;
- /* skip space */
- while( *psz_parser && ( *psz_parser == ' ' || *psz_parser == '\t' || *psz_parser == ';' ) )
+ if( cfg->psz_name == NULL || *cfg->psz_name == '\0' )
{
- psz_parser++;
+ cfg = cfg->p_next;
+ continue;
}
-
- if( ( psz_end = strchr( psz_parser, '=' ) ) != NULL )
+ for( i = 0; ppsz_options[i] != NULL; i++ )
{
- opt.p_next = NULL;
-
- while( psz_end > psz_parser && ( *psz_end == ' ' || *psz_end == '\t' ) )
+ if( !strcmp( ppsz_options[i], cfg->psz_name ) )
{
- psz_end--;
+ break;
}
-
- if( psz_end - psz_parser <= 0 )
+ if( ( !strncmp( cfg->psz_name, "no-", 3 ) &&
+ !strcmp( ppsz_options[i], cfg->psz_name + 3 ) ) ||
+ ( !strncmp( cfg->psz_name, "no", 2 ) &&
+ !strcmp( ppsz_options[i], cfg->psz_name + 2 ) ) )
{
- return( VLC_EGENERIC );
+ b_yes = VLC_FALSE;
+ break;
}
- *psz_end = '\0';
- opt.psz_name = strdup( psz_parser );
-
- psz_parser = psz_end + 1;
- if( ( psz_end = strchr( psz_parser, ';' ) ) == NULL &&
- ( psz_end = strchr( psz_parser, '}' ) ) == NULL )
+ if( *ppsz_options[i] == '*' &&
+ !strcmp( &ppsz_options[i][1], cfg->psz_name ) )
{
- psz_end = psz_parser + strlen( psz_parser ) + 1;
+ b_once = VLC_TRUE;
+ break;
}
- opt.psz_value = strdup( psz_parser );
-
- fprintf( stderr, "option: name=`%s' value=`%s'\n",
- opt.psz_name,
- opt.psz_value );
- psz_parser = psz_end + 1;
-
- *pp_last = malloc( sizeof( mrl_option_t ) );
- **pp_last = opt;
}
- else
+ if( ppsz_options[i] == NULL )
{
- break;
+ msg_Warn( p_this, "option %s is unknown", cfg->psz_name );
+ cfg = cfg->p_next;
+ continue;
}
- }
-}
-#endif
-static int mrl_Parse( mrl_t *p_mrl, char *psz_mrl )
-{
- char * psz_dup = strdup( psz_mrl );
- char * psz_parser = psz_dup;
- char * psz_access = "";
- char * psz_way = "";
- char * psz_name = "";
+ /* create name */
+ asprintf( &psz_name, "%s%s", psz_prefix, b_once ? &ppsz_options[i][1] : ppsz_options[i] );
- /* *** first parse psz_dest */
- while( *psz_parser && *psz_parser != ':' )
- {
- if( *psz_parser == '{' )
+ /* Check if the option is deprecated */
+ p_conf = config_FindConfig( p_this, psz_name );
+
+ /* This is basically cut and paste from src/misc/configuration.c
+ * with slight changes */
+ if( p_conf && p_conf->psz_current )
{
- while( *psz_parser && *psz_parser != '}' )
+ if( !strcmp( p_conf->psz_current, "SUPPRESSED" ) )
{
- psz_parser++;
+ msg_Err( p_this, "Option %s is no longer used.",
+ p_conf->psz_name );
+ goto next;
}
- if( *psz_parser )
+ else if( p_conf->b_strict )
{
- psz_parser++;
+ msg_Err( p_this, "Option %s is deprecated. Use %s instead.",
+ p_conf->psz_name, p_conf->psz_current );
+ /* TODO: this should return an error and end option parsing
+ * ... but doing this would change the VLC API and all the
+ * modules so i'll do it later */
+ goto next;
+ }
+ else
+ {
+ msg_Warn( p_this, "Option %s is deprecated. You should use "
+ "%s instead.", p_conf->psz_name, p_conf->psz_current );
+ free( psz_name );
+ psz_name = strdup( p_conf->psz_current );
}
}
- else
+ /* </Check if the option is deprecated> */
+
+ /* get the type of the variable */
+ i_type = config_GetType( p_this, psz_name );
+ if( !i_type )
{
- psz_parser++;
+ msg_Warn( p_this, "unknown option %s (value=%s)",
+ cfg->psz_name, cfg->psz_value );
+ goto next;
}
- }
-#if defined( WIN32 ) || defined( UNDER_CE )
- if( psz_parser - psz_dup == 1 )
- {
- /* msg_Warn( p_sout, "drive letter %c: found in source string",
- *psz_dup ) ; */
- psz_parser = "";
- }
-#endif
-
- if( !*psz_parser )
- {
- psz_access = psz_way = "";
- psz_name = psz_dup;
- }
- else
- {
- *psz_parser++ = '\0';
-
- /* let's skip '//' */
- if( psz_parser[0] == '/' && psz_parser[1] == '/' )
+ if( i_type != VLC_VAR_BOOL && cfg->psz_value == NULL )
{
- psz_parser += 2 ;
+ msg_Warn( p_this, "missing value for option %s", cfg->psz_name );
+ goto next;
}
-
- psz_name = psz_parser ;
-
- /* Come back to parse the access and mux plug-ins */
- psz_parser = psz_dup;
-
- if( !*psz_parser )
+ if( i_type != VLC_VAR_STRING && b_once )
{
- /* No access */
- psz_access = "";
+ msg_Warn( p_this, "*option_name need to be a string option" );
+ goto next;
}
- else if( *psz_parser == '/' )
+
+ switch( i_type )
{
- /* No access */
- psz_access = "";
- psz_parser++;
+ case VLC_VAR_BOOL:
+ val.b_bool = b_yes;
+ break;
+ case VLC_VAR_INTEGER:
+ val.i_int = strtol( cfg->psz_value ? cfg->psz_value : "0",
+ NULL, 0 );
+ break;
+ case VLC_VAR_FLOAT:
+ val.f_float = atof( cfg->psz_value ? cfg->psz_value : "0" );
+ break;
+ case VLC_VAR_STRING:
+ case VLC_VAR_MODULE:
+ val.psz_string = cfg->psz_value;
+ break;
+ default:
+ msg_Warn( p_this, "unhandled config var type" );
+ memset( &val, 0, sizeof( vlc_value_t ) );
+ break;
}
- else
+ if( b_once )
{
- psz_access = psz_parser;
+ vlc_value_t val2;
- while( *psz_parser && *psz_parser != '/' )
+ var_Get( p_this, psz_name, &val2 );
+ if( *val2.psz_string )
{
- if( *psz_parser == '{' )
- {
- while( *psz_parser && *psz_parser != '}' )
- {
- psz_parser++;
- }
- if( *psz_parser )
- {
- psz_parser++;
- }
- }
- else
- {
- psz_parser++;
- }
- }
-
- if( *psz_parser == '/' )
- {
- *psz_parser++ = '\0';
+ free( val2.psz_string );
+ msg_Dbg( p_this, "ignoring option %s (not first occurrence)", psz_name );
+ goto next;
}
+ free( val2.psz_string );
}
+ var_Set( p_this, psz_name, val );
+ msg_Dbg( p_this, "set sout option: %s to %s", psz_name, cfg->psz_value );
- if( !*psz_parser )
- {
- /* No mux */
- psz_way = "";
- }
- else
- {
- psz_way = psz_parser;
- }
+ next:
+ free( psz_name );
+ cfg = cfg->p_next;
}
+}
+
+
+/*
+ * XXX name and p_cfg are used (-> do NOT free them)
+ */
+sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_chain )
+{
+ sout_stream_t *p_stream;
-#if 0
- if( ( psz_parser = strchr( psz_access, '{' ) ) != NULL )
+ if( !psz_chain )
{
- mrl_ParseOptions( &p_mrl->p_access_options, psz_parser );
- *psz_parser = '\0';
+ msg_Err( p_sout, "invalid chain" );
+ return NULL;
}
- if( ( psz_parser = strchr( psz_way, '{' ) ) != NULL )
+ p_stream = vlc_object_create( p_sout, sizeof( sout_stream_t ) );
+
+ if( !p_stream )
{
- mrl_ParseOptions( &p_mrl->p_way_options, psz_parser );
- *psz_parser = '\0';
+ msg_Err( p_sout, "out of memory" );
+ return NULL;
}
-#endif
- p_mrl->p_access_options = NULL;
- p_mrl->p_way_options = NULL;
+ p_stream->p_sout = p_sout;
+ p_stream->p_sys = NULL;
- p_mrl->psz_access = strdup( psz_access );
- p_mrl->psz_way = strdup( psz_way );
- p_mrl->psz_name = strdup( psz_name );
+ p_stream->psz_next =
+ sout_CfgCreate( &p_stream->psz_name, &p_stream->p_cfg, psz_chain);
- free( psz_dup );
- return( VLC_SUCCESS );
-}
+ msg_Dbg( p_sout, "stream=`%s'", p_stream->psz_name );
+ vlc_object_attach( p_stream, p_sout );
-/* mrl_Clean: clean p_mrl after a call to mrl_Parse */
-static void mrl_Clean( mrl_t *p_mrl )
+ p_stream->p_module =
+ module_Need( p_stream, "sout stream", p_stream->psz_name, VLC_TRUE );
+
+ if( !p_stream->p_module )
+ {
+ sout_StreamDelete( p_stream );
+ return NULL;
+ }
+
+ return p_stream;
+}
+
+void sout_StreamDelete( sout_stream_t *p_stream )
{
- FREE( p_mrl->psz_access );
- FREE( p_mrl->psz_way );
- FREE( p_mrl->psz_name );
+ 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 );
+
+ FREENULL( p_stream->psz_name );
+ FREENULL( p_stream->psz_next );
+
+ sout_CfgDestroy( p_stream->p_cfg );
+
+ msg_Dbg( p_stream, "destroying chain done" );
+ vlc_object_destroy( p_stream );
}
+static char *_sout_stream_url_to_chain( vlc_object_t *p_this, char *psz_url )
+{
+ mrl_t mrl;
+ char *psz_chain, *p;
+
+ mrl_Parse( &mrl, psz_url );
+ 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\",dst=\"%s\"}}",
+ mrl.psz_way, mrl.psz_access, mrl.psz_name );
+ }
+ else
+ {
+ 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 );
+}