/*****************************************************************************
* stream_output.c : stream output module
*****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
+ * Copyright (C) 2002-2004 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@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.
*****************************************************************************/
/*****************************************************************************
#include <vlc/vlc.h>
#include <vlc/sout.h>
+#include <vlc/input.h>
#include "vlc_meta.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void sout_cfg_free( sout_cfg_t * );
+static void sout_CfgDestroy( 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 * );
/*
{
sout_instance_t *p_sout;
vlc_value_t keep;
+ counter_t *p_counter;
if( var_Get( p_parent, "sout-keep", &keep ) < 0 )
{
msg_Warn( p_parent, "cannot get sout-keep value" );
keep.b_bool = VLC_FALSE;
}
- else if( keep.b_bool )
+ if( keep.b_bool )
{
- msg_Warn( p_parent, "sout-keep true" );
if( ( p_sout = vlc_object_find( p_parent, VLC_OBJECT_SOUT,
- FIND_ANYWHERE ) ) )
+ FIND_ANYWHERE ) ) != NULL )
{
if( !strcmp( p_sout->psz_sout, psz_dest ) )
{
- msg_Warn( p_parent, "sout keep : reusing sout" );
- msg_Warn( p_parent, "sout keep : you probably want to use "
+ 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 );
}
else
{
- msg_Warn( p_parent, "sout keep : destroying unusable sout" );
+ 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 ) ) )
+ FIND_PARENT ) ) != NULL )
{
- msg_Warn( p_parent, "sout keep : destroying old sout" );
+ msg_Dbg( p_parent, "sout keep : destroying old sout" );
+ vlc_object_release( p_sout );
sout_DeleteInstance( p_sout );
}
}
/* attach it for inherit */
vlc_object_attach( p_sout, p_parent );
- p_sout->p_stream = sout_stream_new( p_sout, p_sout->psz_chain );
+ /* Create statistics */
+ stats_Create( p_parent, "sout_sent_packets", STATS_SOUT_SENT_PACKETS,
+ VLC_VAR_INTEGER, STATS_COUNTER );
+ stats_Create( p_parent, "sout_sent_bytes", STATS_SOUT_SENT_BYTES,
+ VLC_VAR_INTEGER, STATS_COUNTER );
+ stats_Create( p_parent, "sout_send_bitrate", STATS_SOUT_SEND_BITRATE,
+ VLC_VAR_FLOAT, STATS_DERIVATIVE );
+ p_counter = stats_CounterGet( p_parent, p_parent->i_object_id,
+ STATS_SOUT_SEND_BITRATE );
+ if( p_counter) p_counter->update_interval = 1000000;
+
+ p_sout->p_stream = sout_StreamNew( p_sout, p_sout->psz_chain );
if( p_sout->p_stream == NULL )
{
FREE( p_sout->psz_sout );
FREE( p_sout->psz_chain );
+ vlc_object_detach( p_sout );
vlc_object_destroy( p_sout );
return NULL;
}
vlc_object_detach( p_sout );
/* remove the stream out chain */
- sout_stream_delete( p_sout->p_stream );
+ sout_StreamDelete( p_sout->p_stream );
/* *** free all string *** */
FREE( p_sout->psz_sout );
return NULL;
}
- psz_next = sout_cfg_parser( &p_access->psz_access, &p_access->p_cfg,
+ psz_next = sout_CfgCreate( &p_access->psz_access, &p_access->p_cfg,
psz_access );
if( psz_next )
{
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;
+
vlc_object_attach( p_access, p_sout );
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 );
}
}
free( p_access->psz_access );
- sout_cfg_free( p_access->p_cfg );
+ sout_CfgDestroy( p_access->p_cfg );
free( p_access->psz_name );
*****************************************************************************/
int sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
{
+ int i_total;
+ 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, STATS_SOUT_SENT_PACKETS, 30, NULL );
+ stats_UpdateInteger( p_input, STATS_SOUT_SENT_BYTES,
+ p_access->i_sent_bytes, &i_total );
+ stats_UpdateFloat( p_input, STATS_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_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 = 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->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 = 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 =
+ 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 );
+ 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( p_mux->pf_capacity( p_mux,
- SOUT_MUX_CAP_GET_ADD_STREAM_WAIT, NULL,
- (void*)&b_answer ) != SOUT_MUX_CAP_ERR_OK )
+ /* 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 waiting for all ES before "
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;
}
}
free( p_mux->psz_mux );
- sout_cfg_free( p_mux->p_cfg );
+ sout_CfgDestroy( p_mux->p_cfg );
vlc_object_destroy( p_mux );
}
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 "
+ msg_Err( p_mux, "cannot add a new stream (unsupported while muxing "
"for 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" );
{
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 )
{
- /* more than 1.5 second, start muxing */
+ 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 )
+ {
+ /* Wait until we have more than 1.5 seconds worth of data
+ * before start muxing */
p_mux->b_waiting_stream = VLC_FALSE;
}
else
* 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 || *p == ',' || *p == '}' ) return p;
- if( *p == '{' )
- {
- c = '}';
- }
- else
- {
- c = *p;
- }
+ if( *p != '{' && *p != '"' && *p != '\'' )
+ {
p++;
+ continue;
+ }
- for( ;; )
- {
- if( *p == '\0' )
- {
- return p;
- }
+ if( *p == '{' ) c = '}';
+ else c = *p;
+ 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
+ for( ;; )
{
- p++;
+ if( !*p ) return p;
+
+ if( *p == c ) return ++p;
+ else if( *p == '{' && c == '}' ) p = _get_chain_end( p );
+ else p++;
}
}
}
-char *sout_cfg_parser( char **ppsz_name, sout_cfg_t **pp_cfg, char *psz_chain )
+char *sout_CfgCreate( char **ppsz_name, sout_cfg_t **pp_cfg, char *psz_chain )
{
sout_cfg_t *p_cfg = NULL;
char *p = psz_chain;
}
else
{
- if( *p == '\'' || *p =='"' ||
+ /* Skip heading and trailing spaces.
+ * This ain't necessary but will avoid simple
+ * user mistakes. */
+ SKIPSPACE( p );
+ }
+
+ if( end <= p )
+ {
+ cfg.psz_value = NULL;
+ }
+ else
+ {
+ if( *p == '\'' || *p == '"' ||
( !b_keep_brackets && *p == '{' ) )
{
p++;
- end--;
+
+ if( *(end-1) != '\'' && *(end-1) == '"' )
+ SKIPTRAILINGSPACE( p, end );
+
+ 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( end <= p ) cfg.psz_value = NULL;
- else cfg.psz_value = strndup( p, end - p );
}
p = end;
return NULL;
}
-static void sout_cfg_free( sout_cfg_t *p_cfg )
+static void sout_CfgDestroy( sout_cfg_t *p_cfg )
{
while( p_cfg != NULL )
{
}
}
-void __sout_ParseCfg( vlc_object_t *p_this, char *psz_prefix,
+void __sout_CfgParse( vlc_object_t *p_this, char *psz_prefix,
const char **ppsz_options, sout_cfg_t *cfg )
{
char *psz_name;
/* First, var_Create all variables */
for( i = 0; ppsz_options[i] != NULL; i++ )
{
- asprintf( &psz_name, "%s%s", psz_prefix, ppsz_options[i] );
+ asprintf( &psz_name, "%s%s", psz_prefix,
+ *ppsz_options[i] == '*' ? &ppsz_options[i][1] : ppsz_options[i] );
i_type = config_GetType( p_this, psz_name );
{
vlc_value_t val;
vlc_bool_t b_yes = VLC_TRUE;
+ vlc_bool_t b_once = VLC_FALSE;
+ module_config_t *p_conf;
if( cfg->psz_name == NULL || *cfg->psz_name == '\0' )
{
b_yes = VLC_FALSE;
break;
}
+
+ if( *ppsz_options[i] == '*' &&
+ !strcmp( &ppsz_options[i][1], cfg->psz_name ) )
+ {
+ b_once = VLC_TRUE;
+ break;
+ }
+
}
if( ppsz_options[i] == NULL )
{
+ msg_Warn( p_this, "option %s is unknown", cfg->psz_name );
cfg = cfg->p_next;
continue;
}
/* create name */
- asprintf( &psz_name, "%s%s", psz_prefix, ppsz_options[i] );
+ asprintf( &psz_name, "%s%s", psz_prefix, b_once ? &ppsz_options[i][1] : ppsz_options[i] );
+
+
+ /* 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 )
+ {
+ if( !strcmp( p_conf->psz_current, "SUPPRESSED" ) )
+ {
+ msg_Err( p_this, "Option %s is no longer used.",
+ p_conf->psz_name );
+ goto next;
+ }
+ else if( p_conf->b_strict )
+ {
+ 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 );
+ i_type = config_GetType( p_this, psz_name );
+ free( psz_name );
+ psz_name = strdup( p_conf->psz_current );
+ var_Create( p_this, psz_name, i_type | VLC_VAR_DOINHERIT );
+ }
+ }
+ /* </Check if the option is deprecated> */
/* get the type of the variable */
i_type = config_GetType( p_this, psz_name );
msg_Warn( p_this, "missing value for option %s", cfg->psz_name );
goto next;
}
+ if( i_type != VLC_VAR_STRING && b_once )
+ {
+ msg_Warn( p_this, "*option_name need to be a string option" );
+ goto next;
+ }
switch( i_type )
{
val.b_bool = b_yes;
break;
case VLC_VAR_INTEGER:
- val.i_int = atoi( cfg->psz_value ? cfg->psz_value : "0" );
+ 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:
memset( &val, 0, sizeof( vlc_value_t ) );
break;
}
+ if( b_once )
+ {
+ vlc_value_t val2;
+
+ var_Get( p_this, psz_name, &val2 );
+ if( *val2.psz_string )
+ {
+ 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 );
/*
* 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);
+ sout_CfgCreate( &p_stream->psz_name, &p_stream->p_cfg, psz_chain);
msg_Dbg( p_sout, "stream=`%s'", p_stream->psz_name );
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 );
FREE( p_stream->psz_name );
FREE( p_stream->psz_next );
- sout_cfg_free( p_stream->p_cfg );
+ sout_CfgDestroy( p_stream->p_cfg );
msg_Dbg( p_stream, "destroying chain done" );
vlc_object_destroy( p_stream );
if( config_GetInt( p_this, "sout-display" ) )
{
p += sprintf( p, "duplicate{dst=display,dst=std{mux=\"%s\","
- "access=\"%s\",url=\"%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\"}",
+ p += sprintf( p, "std{mux=\"%s\",access=\"%s\",dst=\"%s\"}",
mrl.psz_way, mrl.psz_access, mrl.psz_name );
}
projects / vlc / blobdiff