* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <assert.h>
+
+#include <vlc_common.h>
#include <stdlib.h> /* free() */
#include <stdio.h> /* sprintf() */
-#include <string.h> /* strerror() */
+#include <string.h>
#include <vlc_sout.h>
-#include <vlc_playlist.h>
#include "stream_output.h"
#include <vlc_meta.h>
+#include <vlc_block.h>
+#include <vlc_codec.h>
+#include <vlc_modules.h>
-#include "input/input_internal.h"
+#include "input/input_interface.h"
+
+#define VLC_CODEC_NULL VLC_FOURCC( 'n', 'u', 'l', 'l' )
#undef DEBUG_BUFFER
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-#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 * );
+static char *sout_stream_url_to_chain( bool, const char * );
/*
* Generic MRL parser
/*****************************************************************************
* 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, const char *psz_dest )
{
+ static const char typename[] = "stream output";
sout_instance_t *p_sout;
- vlc_value_t keep;
- if( var_Get( p_parent, "sout-keep", &keep ) >= 0 && keep.b_bool )
+ char *psz_chain;
+ if( psz_dest && psz_dest[0] == '#' )
{
- /* Remove the sout from the playlist garbage collector */
- playlist_t *p_playlist = pl_Yield( p_parent );
-
- vlc_mutex_lock( &p_playlist->gc_lock );
- p_sout = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, FIND_CHILD );
- if( p_sout && p_sout->p_parent != (vlc_object_t *)p_playlist )
- {
- vlc_object_release( p_sout );
- p_sout = NULL;
- }
- if( p_sout )
- vlc_object_detach( p_sout ); /* Remove it from the GC */
- vlc_mutex_unlock( &p_playlist->gc_lock );
-
- pl_Release( p_parent );
-
- /* */
-
- if( p_sout )
- {
- 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_attach( p_sout, p_parent );
- vlc_object_release( p_sout );
- return p_sout;
- }
-
- msg_Dbg( p_parent, "sout keep: destroying unusable sout" );
- vlc_object_release( p_sout );
- sout_DeleteInstance( p_sout );
- }
+ psz_chain = strdup( &psz_dest[1] );
}
+ else
+ {
+ psz_chain = sout_stream_url_to_chain(
+ var_InheritBool(p_parent, "sout-display"), psz_dest );
+ }
+ if(!psz_chain)
+ return NULL;
/* *** Allocate descriptor *** */
- p_sout = vlc_object_create( p_parent, VLC_OBJECT_SOUT );
+ p_sout = vlc_custom_create( p_parent, sizeof( *p_sout ),
+ VLC_OBJECT_GENERIC, typename );
if( p_sout == NULL )
- {
- msg_Err( p_parent, "out of memory" );
return NULL;
- }
+
+ msg_Dbg( p_sout, "using sout chain=`%s'", psz_chain );
/* *** init descriptor *** */
p_sout->psz_sout = strdup( psz_dest );
p_sout->i_out_pace_nocontrol = 0;
p_sout->p_sys = NULL;
- vlc_mutex_init( p_sout, &p_sout->lock );
- if( psz_dest && psz_dest[0] == '#' )
- {
- p_sout->psz_chain = strdup( &psz_dest[1] );
- }
- else
- {
- 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 );
- }
+ vlc_mutex_init( &p_sout->lock );
p_sout->p_stream = NULL;
/* attach it for inherit */
vlc_object_attach( p_sout, p_parent );
- p_sout->p_stream = sout_StreamNew( p_sout, p_sout->psz_chain );
+ var_Create( p_sout, "sout-mux-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- if( p_sout->p_stream == NULL )
+ p_sout->p_stream = sout_StreamChainNew( p_sout, psz_chain, NULL, NULL );
+ if( p_sout->p_stream )
{
- msg_Err( p_sout, "stream chain failed for `%s'", p_sout->psz_chain );
+ free( psz_chain );
+ return p_sout;
+ }
- FREENULL( p_sout->psz_sout );
- FREENULL( p_sout->psz_chain );
+ msg_Err( p_sout, "stream chain failed for `%s'", psz_chain );
+ free( psz_chain );
- vlc_object_detach( p_sout );
- vlc_object_destroy( p_sout );
- return NULL;
- }
+ FREENULL( p_sout->psz_sout );
- return p_sout;
+ vlc_object_release( p_sout );
+ return NULL;
}
/*****************************************************************************
*****************************************************************************/
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 );
+ sout_StreamChainDelete( p_sout->p_stream, NULL );
/* *** free all string *** */
FREENULL( p_sout->psz_sout );
- FREENULL( p_sout->psz_chain );
/* delete meta */
if( p_sout->p_meta )
vlc_mutex_destroy( &p_sout->lock );
/* *** free structure *** */
- vlc_object_destroy( p_sout );
+ vlc_object_release( p_sout );
}
+/*****************************************************************************
+ *
+ *****************************************************************************/
+void sout_UpdateStatistic( sout_instance_t *p_sout, sout_statistic_t i_type, int i_delta )
+{
+ if( !libvlc_stats( p_sout ) )
+ return;
+
+ /* */
+ input_thread_t *p_input = vlc_object_find( p_sout, VLC_OBJECT_INPUT, FIND_PARENT );
+ if( !p_input )
+ return;
+
+ int i_input_type;
+ switch( i_type )
+ {
+ case SOUT_STATISTIC_DECODED_VIDEO:
+ i_input_type = SOUT_STATISTIC_DECODED_VIDEO;
+ break;
+ case SOUT_STATISTIC_DECODED_AUDIO:
+ i_input_type = SOUT_STATISTIC_DECODED_AUDIO;
+ break;
+ case SOUT_STATISTIC_DECODED_SUBTITLE:
+ i_input_type = SOUT_STATISTIC_DECODED_SUBTITLE;
+ break;
+
+ case SOUT_STATISTIC_SENT_PACKET:
+ i_input_type = SOUT_STATISTIC_SENT_PACKET;
+ break;
+
+ case SOUT_STATISTIC_SENT_BYTE:
+ i_input_type = SOUT_STATISTIC_SENT_BYTE;
+ break;
+
+ default:
+ msg_Err( p_sout, "Not yet supported statistic type %d", i_type );
+ vlc_object_release( p_input );
+ return;
+ }
+
+ input_UpdateStatistic( p_input, i_input_type, i_delta );
+
+ vlc_object_release( p_input );
+}
/*****************************************************************************
* Packetizer/Input
*****************************************************************************/
{
sout_packetizer_input_t *p_input;
- msg_Dbg( p_sout, "adding a new input" );
-
/* *** create a packetizer input *** */
p_input = malloc( sizeof( sout_packetizer_input_t ) );
+ if( !p_input ) return NULL;
p_input->p_sout = p_sout;
p_input->p_fmt = p_fmt;
- if( p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
+ msg_Dbg( p_sout, "adding a new sout input (sout_input:%p)", p_input );
+
+ if( p_fmt->i_codec == VLC_CODEC_NULL )
{
vlc_object_release( p_sout );
return p_input;
{
sout_instance_t *p_sout = p_input->p_sout;
- msg_Dbg( p_sout, "removing an input" );
+ msg_Dbg( p_sout, "removing a sout input (sout_input:%p)", p_input );
- if( p_input->p_fmt->i_codec != VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
+ if( p_input->p_fmt->i_codec != VLC_CODEC_NULL )
{
vlc_mutex_lock( &p_sout->lock );
p_sout->p_stream->pf_del( p_sout->p_stream, p_input->id );
sout_instance_t *p_sout = p_input->p_sout;
int i_ret;
- if( p_input->p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
+ if( p_input->p_fmt->i_codec == VLC_CODEC_NULL )
{
block_Release( p_buffer );
return VLC_SUCCESS;
}
- if( p_buffer->i_dts <= 0 )
+
+ if( p_buffer->i_dts <= VLC_TS_INVALID )
{
msg_Warn( p_sout, "trying to send non-dated packet to stream output!");
block_Release( p_buffer );
return i_ret;
}
+#undef sout_AccessOutNew
/*****************************************************************************
* sout_AccessOutNew: allocate a new access out
*****************************************************************************/
-sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout,
+sout_access_out_t *sout_AccessOutNew( vlc_object_t *p_sout,
const char *psz_access, const char *psz_name )
{
+ static const char typename[] = "access out";
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" );
+ p_access = vlc_custom_create( p_sout, sizeof( *p_access ),
+ VLC_OBJECT_GENERIC, typename );
+ if( !p_access )
return NULL;
- }
psz_next = config_ChainCreate( &p_access->psz_access, &p_access->p_cfg,
psz_access );
- if( psz_next )
- {
- free( psz_next );
- }
+ free( psz_next );
p_access->psz_path = strdup( psz_name ? psz_name : "" );
- p_access->p_sout = p_sout;
- p_access->p_sys = NULL;
+ p_access->p_sys = NULL;
p_access->pf_seek = NULL;
p_access->pf_read = NULL;
p_access->pf_write = NULL;
vlc_object_attach( p_access, p_sout );
p_access->p_module =
- module_Need( p_access, "sout access", p_access->psz_access, VLC_TRUE );
+ module_need( p_access, "sout access", p_access->psz_access, true );
if( !p_access->p_module )
{
free( p_access->psz_access );
free( p_access->psz_path );
- vlc_object_detach( p_access );
- vlc_object_destroy( p_access );
+ vlc_object_release( 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 );
+ module_unneed( p_access, p_access->p_module );
}
free( p_access->psz_access );
free( p_access->psz_path );
- vlc_object_destroy( p_access );
+ vlc_object_release( p_access );
}
/*****************************************************************************
/*****************************************************************************
* sout_AccessRead:
*****************************************************************************/
-int sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer )
+ssize_t sout_AccessOutRead( sout_access_out_t *p_access, block_t *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 )
+ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
{
- int i_total = 0;
+#if 0
+ const unsigned i_packets_gather = 30;
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 )
+ if( (p_access->i_writes % i_packets_gather) == 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 );
- }
+ sout_UpdateStatistic( p_access->p_sout, SOUT_STATISTIC_SENT_PACKET, i_packets_gather );
+ sout_UpdateStatistic( p_access->p_sout, SOUT_STATISTIC_SENT_BYTE, p_access->i_sent_bytes );
+ p_access->i_sent_bytes = 0;
}
+#endif
return p_access->pf_write( p_access, p_buffer );
}
/**
* sout_AccessOutControl
*/
-int sout_AccessOutControl (sout_access_out_t *access, int query, va_list args)
+int sout_AccessOutControl (sout_access_out_t *access, int query, ...)
{
- return (access->pf_control) ? access->pf_control (access, query, args)
- : VLC_EGENERIC;
+ va_list ap;
+ int ret;
+
+ va_start (ap, query);
+ if (access->pf_control)
+ ret = access->pf_control (access, query, ap);
+ else
+ ret = VLC_EGENERIC;
+ va_end (ap);
+ return ret;
}
/*****************************************************************************
* sout_MuxNew: create a new mux
*****************************************************************************/
-sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, char *psz_mux,
+sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, const char *psz_mux,
sout_access_out_t *p_access )
{
+ static const char typename[] = "mux";
sout_mux_t *p_mux;
char *psz_next;
- p_mux = vlc_object_create( p_sout, sizeof( sout_mux_t ) );
+ p_mux = vlc_custom_create( p_sout, sizeof( *p_mux ), VLC_OBJECT_GENERIC,
+ typename);
if( p_mux == NULL )
- {
- msg_Err( p_sout, "out of memory" );
return NULL;
- }
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 );
+ free( psz_next );
p_mux->p_access = p_access;
p_mux->pf_control = 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->b_add_stream_any_time = false;
+ p_mux->b_waiting_stream = 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 );
+ module_need( p_mux, "sout mux", p_mux->psz_mux, true );
if( p_mux->p_module == NULL )
{
FREENULL( p_mux->psz_mux );
- vlc_object_detach( p_mux );
- vlc_object_destroy( p_mux );
+ vlc_object_release( p_mux );
return NULL;
}
/* *** probe mux capacity *** */
if( p_mux->pf_control )
{
- int b_answer = VLC_FALSE;
+ int b_answer = false;
if( sout_MuxControl( p_mux, MUX_CAN_ADD_STREAM_WHILE_MUXING,
&b_answer ) )
{
- b_answer = VLC_FALSE;
+ b_answer = 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;
+ p_mux->b_add_stream_any_time = true;
+ p_mux->b_waiting_stream = 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;
+ b_answer = true;
}
else if( sout_MuxControl( p_mux, MUX_GET_ADD_STREAM_WAIT,
&b_answer ) )
{
- b_answer = VLC_FALSE;
+ b_answer = 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;
+ p_mux->b_waiting_stream = true;
}
}
}
*****************************************************************************/
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 );
+ module_unneed( p_mux, p_mux->p_module );
}
free( p_mux->psz_mux );
config_ChainDestroy( p_mux->p_cfg );
- vlc_object_destroy( p_mux );
+ vlc_object_release( p_mux );
}
/*****************************************************************************
if( !p_mux->b_add_stream_any_time && !p_mux->b_waiting_stream )
{
msg_Err( p_mux, "cannot add a new stream (unsupported while muxing "
- "to this format)" );
+ "to this format). You can try increasing sout-mux-caching value" );
return NULL;
}
/* create a new sout input */
p_input = malloc( sizeof( sout_input_t ) );
+ if( !p_input )
+ return NULL;
p_input->p_sout = p_mux->p_sout;
p_input->p_fmt = p_fmt;
- p_input->p_fifo = block_FifoNew( p_mux->p_sout );
+ p_input->p_fifo = block_FifoNew();
p_input->p_sys = NULL;
TAB_APPEND( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input );
if( p_mux->pf_addstream( p_mux, p_input ) < 0 )
{
- msg_Err( p_mux, "cannot add this stream" );
- TAB_REMOVE( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input );
- block_FifoRelease( p_input->p_fifo );
- free( p_input );
- return NULL;
+ msg_Err( p_mux, "cannot add this stream" );
+ 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;
{
int i_index;
- if( p_mux->b_waiting_stream && p_input->p_fifo->i_depth > 0 )
+ if( p_mux->b_waiting_stream
+ && block_FifoCount( p_input->p_fifo ) > 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->b_waiting_stream = false;
p_mux->pf_mux( p_mux );
}
{
mtime_t current_date = mdate();
if ( current_date > p_buffer->i_dts )
- msg_Warn( p_mux, "late buffer for mux input ("I64Fd")",
+ msg_Warn( p_mux, "late buffer for mux input (%"PRId64")",
current_date - p_buffer->i_dts );
}
if( p_mux->b_waiting_stream )
{
+ const int64_t i_caching = var_GetInteger( p_mux->p_sout, "sout-mux-caching" ) * INT64_C(1000);
+
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 )
+ /* Wait until we have enought data before muxing */
+ if( p_mux->i_add_stream_start < 0 ||
+ p_buffer->i_dts < p_mux->i_add_stream_start + i_caching )
+ return;
+ p_mux->b_waiting_stream = false;
+ }
+ p_mux->pf_mux( p_mux );
+}
+
+
+/*****************************************************************************
+ * sout_MuxGetStream: find stream to be muxed
+ *****************************************************************************/
+int sout_MuxGetStream( sout_mux_t *p_mux, int i_blocks, mtime_t *pi_dts )
+{
+ mtime_t i_dts = 0;
+ int i_stream = -1;
+
+ for( int i = 0; i < p_mux->i_nb_inputs; i++ )
+ {
+ sout_input_t *p_input = p_mux->pp_inputs[i];
+ block_t *p_data;
+
+ if( block_FifoCount( p_input->p_fifo ) < i_blocks )
{
- /* Wait until we have more than 1.5 seconds worth of data
- * before start muxing */
- p_mux->b_waiting_stream = VLC_FALSE;
+ if( p_input->p_fmt->i_cat != SPU_ES )
+ {
+ return -1;
+ }
+ /* FIXME: SPU muxing */
+ continue;
}
- else
+
+ p_data = block_FifoShow( p_input->p_fifo );
+ if( i_stream < 0 || p_data->i_dts < i_dts )
{
- return;
+ i_stream = i;
+ i_dts = p_data->i_dts;
}
}
- p_mux->pf_mux( p_mux );
+
+ if( pi_dts ) *pi_dts = i_dts;
+
+ return i_stream;
}
+
/*****************************************************************************
*
*****************************************************************************/
****************************************************************************
****************************************************************************/
-/* create a complete chain */
-/* chain format:
- module{option=*:option=*}[:module{option=*:...}]
- */
-
-/*
- * 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 )
+/* Destroy a "stream_out" module */
+static void sout_StreamDelete( sout_stream_t *p_stream )
{
- char c, *p = str;
+ msg_Dbg( p_stream, "destroying chain... (name=%s)", p_stream->psz_name );
- SKIPSPACE( p );
+ if( p_stream->p_module ) module_unneed( p_stream, p_stream->p_module );
- for( ;; )
- {
- if( !*p || *p == ',' || *p == '}' ) return p;
+ FREENULL( p_stream->psz_name );
- if( *p != '{' && *p != '"' && *p != '\'' )
- {
- p++;
- continue;
- }
+ config_ChainDestroy( p_stream->p_cfg );
- if( *p == '{' ) c = '}';
- else c = *p;
- p++;
+ msg_Dbg( p_stream, "destroying chain done" );
+ vlc_object_release( p_stream );
+}
- for( ;; )
- {
- if( !*p ) return p;
+/* Destroy a "stream_out" modules chain
+ *
+ * p_first is the first module to be destroyed in the chain
+ * p_last is the last module to be destroyed
+ * if NULL, all modules are destroyed
+ * if not NULL, modules following it must be destroyed separately
+ */
+void sout_StreamChainDelete(sout_stream_t *p_first, sout_stream_t *p_last)
+{
+ while(p_first != NULL)
+ {
+ sout_stream_t *p_next = p_first->p_next;
- if( *p == c ) return ++p;
- else if( *p == '{' && c == '}' ) p = _get_chain_end( p );
- else p++;
- }
+ sout_StreamDelete(p_first);
+ if(p_first == p_last)
+ break;
+ p_first = p_next;
}
}
+/* Create a "stream_out" module, which may forward its ES to p_next module */
/*
* XXX name and p_cfg are used (-> do NOT free them)
*/
-sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_chain )
+static sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_name,
+ config_chain_t *p_cfg, sout_stream_t *p_next)
{
+ static const char typename[] = "stream out";
sout_stream_t *p_stream;
- if( !psz_chain )
- {
- msg_Err( p_sout, "invalid chain" );
- return NULL;
- }
-
- p_stream = vlc_object_create( p_sout, sizeof( sout_stream_t ) );
+ assert(psz_name);
+ p_stream = vlc_custom_create( p_sout, sizeof( *p_stream ),
+ VLC_OBJECT_GENERIC, typename );
if( !p_stream )
- {
- msg_Err( p_sout, "out of memory" );
return NULL;
- }
p_stream->p_sout = p_sout;
p_stream->p_sys = NULL;
-
- p_stream->psz_next =
- config_ChainCreate( &p_stream->psz_name, &p_stream->p_cfg, psz_chain);
+ p_stream->psz_name = psz_name;
+ p_stream->p_cfg = p_cfg;
+ p_stream->p_next = p_next;
msg_Dbg( p_sout, "stream=`%s'", p_stream->psz_name );
vlc_object_attach( p_stream, p_sout );
p_stream->p_module =
- module_Need( p_stream, "sout stream", p_stream->psz_name, VLC_TRUE );
+ module_need( p_stream, "sout stream", p_stream->psz_name, true );
if( !p_stream->p_module )
{
+ /* those must be freed by the caller if creation failed */
+ p_stream->psz_name = NULL;
+ p_stream->p_cfg = NULL;
+
sout_StreamDelete( p_stream );
return NULL;
}
return p_stream;
}
-void sout_StreamDelete( sout_stream_t *p_stream )
+/* Creates a complete "stream_out" modules chain
+ *
+ * chain format: module1{option=*:option=*}[:module2{option=*:...}]
+ *
+ * The modules are created starting from the last one and linked together
+ * A pointer to the last module created is stored if pp_last isn't NULL, to
+ * make sure sout_StreamChainDelete doesn't delete modules created in another
+ * place.
+ *
+ * Returns a pointer to the first module.
+ */
+sout_stream_t *sout_StreamChainNew(sout_instance_t *p_sout, char *psz_chain,
+ sout_stream_t *p_next, sout_stream_t **pp_last)
{
- msg_Dbg( p_stream, "destroying chain... (name=%s)", p_stream->psz_name );
+ if(!psz_chain || !*psz_chain)
+ {
+ if(pp_last) *pp_last = NULL;
+ return p_next;
+ }
- vlc_object_detach( p_stream );
- if( p_stream->p_module ) module_Unneed( p_stream, p_stream->p_module );
+ char *psz_parser = strdup(psz_chain);
+ if(!psz_parser)
+ return NULL;
- FREENULL( p_stream->psz_name );
- FREENULL( p_stream->psz_next );
+ vlc_array_t cfg, name;
+ vlc_array_init(&cfg);
+ vlc_array_init(&name);
- config_ChainDestroy( p_stream->p_cfg );
+ /* parse chain */
+ while(psz_parser)
+ {
+ config_chain_t *p_cfg;
+ char *psz_name;
+ psz_chain = config_ChainCreate( &psz_name, &p_cfg, psz_parser );
+ free( psz_parser );
+ psz_parser = psz_chain;
- msg_Dbg( p_stream, "destroying chain done" );
- vlc_object_destroy( p_stream );
+ vlc_array_append(&cfg, p_cfg);
+ vlc_array_append(&name, psz_name);
+ }
+
+ int i = vlc_array_count(&name);
+ vlc_array_t module;
+ vlc_array_init(&module);
+ while(i--)
+ {
+ p_next = sout_StreamNew( p_sout, vlc_array_item_at_index(&name, i),
+ vlc_array_item_at_index(&cfg, i), p_next);
+
+ if(!p_next)
+ goto error;
+
+ if(i == vlc_array_count(&name) - 1 && pp_last)
+ *pp_last = p_next; /* last module created in the chain */
+
+ vlc_array_append(&module, p_next);
+ }
+
+ vlc_array_clear(&name);
+ vlc_array_clear(&cfg);
+ vlc_array_clear(&module);
+
+ return p_next;
+
+error:
+
+ i++; /* last module couldn't be created */
+
+ /* destroy all modules created, starting with the last one */
+ int modules = vlc_array_count(&module);
+ while(modules--)
+ sout_StreamDelete(vlc_array_item_at_index(&module, modules));
+ vlc_array_clear(&module);
+
+ /* then destroy all names and config which weren't destroyed by
+ * sout_StreamDelete */
+ while(i--)
+ {
+ free(vlc_array_item_at_index(&name, i));
+ config_ChainDestroy(vlc_array_item_at_index(&cfg, i));
+ }
+ vlc_array_clear(&name);
+ vlc_array_clear(&cfg);
+
+ return NULL;
}
-static char *_sout_stream_url_to_chain( vlc_object_t *p_this, char *psz_url )
+static char *sout_stream_url_to_chain( bool b_sout_display,
+ const char *psz_url )
{
mrl_t mrl;
- char *psz_chain, *p;
+ char *psz_chain;
mrl_Parse( &mrl, psz_url );
- p = psz_chain = malloc( 500 + strlen( mrl.psz_way ) +
- strlen( mrl.psz_access ) +
- strlen( mrl.psz_name ) );
+ /* Check if the URLs goes to #rtp - otherwise we'll use #standard */
+ static const char rtplist[] = "dccp\0sctp\0tcp\0udplite\0";
+ for (const char *a = rtplist; *a; a += strlen (a) + 1)
+ if (strcmp (a, mrl.psz_access) == 0)
+ goto rtp;
- if( config_GetInt( p_this, "sout-display" ) )
+ if (strcmp (mrl.psz_access, "rtp") == 0)
{
- p += sprintf( p, "duplicate{dst=display,dst=std{mux=\"%s\","
- "access=\"%s\",dst=\"%s\"}}",
- mrl.psz_way, mrl.psz_access, mrl.psz_name );
+ char *port;
+ /* For historical reasons, rtp:// means RTP over UDP */
+ strcpy (mrl.psz_access, "udp");
+rtp:
+ if (mrl.psz_name[0] == '[')
+ {
+ port = strstr (mrl.psz_name, "]:");
+ if (port != NULL)
+ port++;
+ }
+ else
+ port = strchr (mrl.psz_name, ':');
+ if (port != NULL)
+ *port++ = '\0'; /* erase ':' */
+
+ if (asprintf (&psz_chain,
+ "rtp{mux=\"%s\",proto=\"%s\",dst=\"%s%s%s\"}",
+ mrl.psz_way, mrl.psz_access, mrl.psz_name,
+ port ? "\",port=\"" : "", port ? port : "") == -1)
+ psz_chain = NULL;
}
else
{
- p += sprintf( p, "std{mux=\"%s\",access=\"%s\",dst=\"%s\"}",
- mrl.psz_way, mrl.psz_access, mrl.psz_name );
+ /* Convert the URL to a basic standard sout chain */
+ if (asprintf (&psz_chain,
+ "standard{mux=\"%s\",access=\"%s\",dst=\"%s\"}",
+ mrl.psz_way, mrl.psz_access, mrl.psz_name) == -1)
+ psz_chain = NULL;
+ }
+
+ /* Duplicate and wrap if sout-display is on */
+ if (psz_chain && b_sout_display)
+ {
+ char *tmp;
+ if (asprintf (&tmp, "duplicate{dst=display,dst=%s}", psz_chain) == -1)
+ tmp = NULL;
+ free (psz_chain);
+ psz_chain = tmp;
}
mrl_Clean( &mrl );
- return( psz_chain );
+ return psz_chain;
+}
+
+#undef sout_EncoderCreate
+encoder_t *sout_EncoderCreate( vlc_object_t *p_this )
+{
+ static const char type[] = "encoder";
+ return vlc_custom_create( p_this, sizeof( encoder_t ), VLC_OBJECT_GENERIC,
+ type );
}
projects / vlc / blobdiff