/*****************************************************************************
* 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.
*****************************************************************************/
/*****************************************************************************
* 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"
*****************************************************************************/
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 * );
/*
/* 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
*****************************************************************************/
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 );
}
}
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 p_sout;
}
+
/*****************************************************************************
* sout_DeleteInstance: delete a previously allocated instance
*****************************************************************************/
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 )
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 =
*****************************************************************************/
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 );
}
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->p_sout = p_sout;
psz_next = sout_CfgCreate( &p_mux->psz_mux, &p_mux->p_cfg, psz_mux );
- if( psz_next )
- {
- free( psz_next );
- }
+ if( psz_next ) free( psz_next );
+
p_mux->p_access = p_access;
p_mux->pf_control = NULL;
p_mux->pf_addstream = 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 );
+ FREENULL( p_mux->psz_mux );
vlc_object_detach( p_mux );
vlc_object_destroy( p_mux );
/* *** probe mux capacity *** */
if( p_mux->pf_control )
{
- int b_answer;
- if( sout_MuxControl( p_mux, MUX_CAN_ADD_STREAM_WHILE_MUXING, &b_answer ) )
+ 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( sout_MuxControl( p_mux, MUX_GET_ADD_STREAM_WAIT, &b_answer ) )
+ /* 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 "
- "starting muxing" );
+ 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;
}
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" );
{
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" );
}
block_FifoRelease( p_input->p_fifo );
{
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
/* 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 );
}
p_next = p_cfg->p_next;
- FREE( p_cfg->psz_name );
- FREE( p_cfg->psz_value );
+ FREENULL( p_cfg->psz_name );
+ FREENULL( p_cfg->psz_value );
free( p_cfg );
p_cfg = p_next;
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' )
{
/* create name */
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 );
+ free( psz_name );
+ psz_name = strdup( p_conf->psz_current );
+ }
+ }
+ /* </Check if the option is deprecated> */
+
/* get the type of the variable */
i_type = config_GetType( p_this, psz_name );
if( !i_type )
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:
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_CfgDestroy( p_stream->p_cfg );
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 );
}