# include "config.h"
#endif
+#include <assert.h>
+
#include <vlc_common.h>
#include <stdlib.h> /* free() */
#include <vlc_meta.h>
#include <vlc_block.h>
#include <vlc_codec.h>
+#include <vlc_modules.h>
#include "input/input_interface.h"
/*****************************************************************************
* 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 *, const char * );
+static char *sout_stream_url_to_chain( bool, const char * );
/*
* Generic MRL parser
static const char typename[] = "stream output";
sout_instance_t *p_sout;
+ char *psz_chain;
+ if( psz_dest && psz_dest[0] == '#' )
+ {
+ 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_custom_create( p_parent, sizeof( *p_sout ),
VLC_OBJECT_GENERIC, typename );
if( p_sout == NULL )
return NULL;
+ msg_Dbg( p_sout, "using sout chain=`%s'", psz_chain );
+
/* *** init descriptor *** */
p_sout->psz_sout = strdup( psz_dest );
p_sout->p_meta = NULL;
p_sout->p_sys = NULL;
vlc_mutex_init( &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 );
- }
p_sout->p_stream = NULL;
/* attach it for inherit */
vlc_object_attach( p_sout, p_parent );
- /* */
var_Create( p_sout, "sout-mux-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- /* */
- p_sout->p_stream = sout_StreamNew( p_sout, p_sout->psz_chain );
- 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_release( 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 )
{
/* 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 )
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 );
{
free( p_access->psz_access );
free( p_access->psz_path );
- vlc_object_detach( 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 );
{
FREENULL( p_mux->psz_mux );
- vlc_object_detach( p_mux );
vlc_object_release( p_mux );
return NULL;
}
*****************************************************************************/
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 );
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 )
+ {
+ if( p_input->p_fmt->i_cat != SPU_ES )
+ {
+ return -1;
+ }
+ /* FIXME: SPU muxing */
+ continue;
+ }
+
+ p_data = block_FifoShow( p_input->p_fifo );
+ if( i_stream < 0 || p_data->i_dts < i_dts )
+ {
+ i_stream = i;
+ i_dts = p_data->i_dts;
+ }
+ }
+
+ if( pi_dts ) *pi_dts = i_dts;
+
+ return i_stream;
+}
+
+
/*****************************************************************************
*
*****************************************************************************/
****************************************************************************
****************************************************************************/
-/* create a complete chain */
-/* chain format:
- module{option=*:option=*}[:module{option=*:...}]
- */
+/* Destroy a "stream_out" module */
+static void sout_StreamDelete( sout_stream_t *p_stream )
+{
+ msg_Dbg( p_stream, "destroying chain... (name=%s)", p_stream->psz_name );
-/*
- * parse module{options=str, option="str "}:
- * return a pointer on the rest
- * XXX: psz_chain is modified
+ if( p_stream->p_module ) module_unneed( p_stream, p_stream->p_module );
+
+ FREENULL( p_stream->psz_name );
+
+ config_ChainDestroy( p_stream->p_cfg );
+
+ msg_Dbg( p_stream, "destroying chain done" );
+ vlc_object_release( p_stream );
+}
+
+/* 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;
+ 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;
- }
+ assert(psz_name);
p_stream = vlc_custom_create( p_sout, sizeof( *p_stream ),
VLC_OBJECT_GENERIC, typename );
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 );
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;
+
+ vlc_array_append(&cfg, p_cfg);
+ vlc_array_append(&name, psz_name);
+ }
- msg_Dbg( p_stream, "destroying chain done" );
- vlc_object_release( p_stream );
+ 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,
- const char *psz_url )
+static char *sout_stream_url_to_chain( bool b_sout_display,
+ const char *psz_url )
{
mrl_t mrl;
char *psz_chain;
}
/* Duplicate and wrap if sout-display is on */
- if (psz_chain && (config_GetInt( p_this, "sout-display" ) > 0))
+ if (psz_chain && b_sout_display)
{
char *tmp;
- if (asprintf (&tmp, "duplicate{dst=display,dst=%s}", tmp) == -1)
+ if (asprintf (&tmp, "duplicate{dst=display,dst=%s}", psz_chain) == -1)
tmp = NULL;
free (psz_chain);
psz_chain = tmp;
projects / vlc / blobdiff