/*****************************************************************************
* stream_output.c : stream output module
*****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
# 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
/* mrl_Clean: clean p_mrl after a call to mrl_Parse */
static void mrl_Clean( mrl_t *p_mrl );
+#undef sout_NewInstance
+
/*****************************************************************************
* sout_NewInstance: creates a new stream output instance
*****************************************************************************/
-sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, const 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;
+ char *psz_chain;
+
+ assert( psz_dest != NULL );
+
+ if( 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 );
+ p_sout = vlc_custom_create( p_parent, sizeof( *p_sout ), "stream output" );
if( p_sout == NULL )
+ {
+ free( psz_chain );
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->i_out_pace_nocontrol = 0;
- 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_mutex_destroy( &p_sout->lock );
+ 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 )
- {
- vlc_meta_Delete( p_sout->p_meta );
- }
vlc_mutex_destroy( &p_sout->lock );
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
*****************************************************************************/
return VLC_SUCCESS;
}
- 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 VLC_SUCCESS;
- }
-
vlc_mutex_lock( &p_sout->lock );
i_ret = p_sout->p_stream->pf_send( p_sout->p_stream,
p_input->id, p_buffer );
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;
- p_access = vlc_custom_create( p_sout, sizeof( *p_access ),
- VLC_OBJECT_GENERIC, typename );
+ p_access = vlc_custom_create( p_sout, sizeof( *p_access ), "access out" );
if( !p_access )
return NULL;
p_access->pf_control = 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 =
module_need( p_access, "sout access", p_access->psz_access, true );
{
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 );
*****************************************************************************/
ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
{
-#if 0
- const unsigned i_packets_gather = 30;
- p_access->i_writes++;
- p_access->i_sent_bytes += p_buffer->i_buffer;
- if( (p_access->i_writes % i_packets_gather) == 0 )
- {
- 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_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_custom_create( p_sout, sizeof( *p_mux ), VLC_OBJECT_GENERIC,
- typename);
+ p_mux = vlc_custom_create( p_sout, sizeof( *p_mux ), "mux" );
if( p_mux == NULL )
return NULL;
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, true );
{
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 );
/*****************************************************************************
* sout_MuxAddStream:
*****************************************************************************/
-sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux, es_format_t *p_fmt )
+sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux, const es_format_t *p_fmt )
{
sout_input_t *p_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;
+
+ // FIXME: remove either fmt or p_fmt...
+ es_format_Copy( &p_input->fmt, p_fmt );
+ p_input->p_fmt = &p_input->fmt;
+
p_input->p_fifo = block_FifoNew();
p_input->p_sys = NULL;
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 delete this stream from mux" );
- }
+ p_mux->pf_delstream( p_mux, p_input );
/* remove the entry */
TAB_REMOVE( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input );
}
block_FifoRelease( p_input->p_fifo );
+ es_format_Clean( &p_input->fmt );
free( p_input );
}
}
/*****************************************************************************
* sout_MuxSendBuffer:
*****************************************************************************/
-void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input,
+int sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input,
block_t *p_buffer )
{
+ mtime_t i_dts = p_buffer->i_dts;
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 )
+ if ( current_date > i_dts )
msg_Warn( p_mux, "late buffer for mux input (%"PRId64")",
- current_date - p_buffer->i_dts );
+ current_date - 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;
+ p_mux->i_add_stream_start = 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;
+ i_dts < p_mux->i_add_stream_start + i_caching )
+ return VLC_SUCCESS;
p_mux->b_waiting_stream = false;
}
- p_mux->pf_mux( p_mux );
+ return 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 )
+int sout_MuxGetStream( sout_mux_t *p_mux, unsigned i_blocks, mtime_t *pi_dts )
{
mtime_t i_dts = 0;
int i_stream = -1;
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_mux->b_add_stream_any_time) && block_FifoCount( p_input->p_fifo ) < i_blocks )
{
if( p_input->p_fmt->i_cat != SPU_ES )
{
psz_parser++;
}
}
-#if defined( WIN32 ) || defined( UNDER_CE )
+#if defined( _WIN32 ) || defined( __OS2__ )
if( psz_parser - psz_dup == 1 )
{
/* msg_Warn( p_sout, "drive letter %c: found in source string",
****************************************************************************
****************************************************************************/
-/* 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 )
+{
+ sout_instance_t *p_sout = (sout_instance_t *)(p_stream->p_parent);
-/*
- * parse module{options=str, option="str "}:
- * return a pointer on the rest
- * XXX: psz_chain is modified
+ msg_Dbg( p_stream, "destroying chain... (name=%s)", p_stream->psz_name );
+
+ p_sout->i_out_pace_nocontrol -= p_stream->pace_nocontrol;
+
+ if( p_stream->p_module != NULL )
+ 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 = vlc_custom_create( p_sout, sizeof( *p_stream ), "stream out" );
if( !p_stream )
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;
+ p_stream->pace_nocontrol = false;
+ p_stream->p_sys = NULL;
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, 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;
}
+ p_sout->i_out_pace_nocontrol += p_stream->pace_nocontrol;
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;
+ }
+
+ char *psz_parser = strdup(psz_chain);
+ if(!psz_parser)
+ return NULL;
- vlc_object_detach( p_stream );
- if( p_stream->p_module ) module_unneed( p_stream, p_stream->p_module );
+ vlc_array_t cfg, name;
+ vlc_array_init(&cfg);
+ vlc_array_init(&name);
- FREENULL( p_stream->psz_name );
- FREENULL( p_stream->psz_next );
+ /* 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;
- config_ChainDestroy( p_stream->p_cfg );
+ 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;
#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 );
+ return vlc_custom_create( p_this, sizeof( encoder_t ), "encoder" );
}
projects / vlc / blobdiff