X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fstream_output%2Fstream_output.c;h=ab1918dd82161d8c50a1026d8194cb6858e3f275;hb=95759bad03b6ab0c6e9f02ce346680d2c7bd760a;hp=c6980a9a8b485d3623f2b2d0fde4406db59c5230;hpb=4c8296b58b24175921b37f99dfa7bda5e08f6cdb;p=vlc diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index c6980a9a8b..ab1918dd82 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -31,6 +31,8 @@ # include "config.h" #endif +#include + #include #include /* free() */ @@ -42,16 +44,18 @@ #include "stream_output.h" #include +#include +#include + +#include "input/input_interface.h" -#include "input/input_internal.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 *, const char * ); +static char *sout_stream_url_to_chain( bool, const char * ); /* * Generic MRL parser @@ -73,17 +77,32 @@ static void mrl_Clean( mrl_t *p_mrl ); /***************************************************************************** * 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; + 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; @@ -91,38 +110,28 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest ) 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_detach( p_sout ); + vlc_object_release( p_sout ); + return NULL; } /***************************************************************************** @@ -131,11 +140,10 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest ) 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 ) @@ -154,52 +162,43 @@ void sout_DeleteInstance( sout_instance_t * p_sout ) *****************************************************************************/ void sout_UpdateStatistic( sout_instance_t *p_sout, sout_statistic_t i_type, int i_delta ) { - input_thread_t *p_input; - int i_bytes; /* That's pretty stupid to define it as an integer, it will overflow - really fast ... */ - - if( !libvlc_stats (p_sout) ) + if( !libvlc_stats( p_sout ) ) return; - /* FIXME that's ugly - * TODO add a private (ie not VLC_EXPORTed) input_UpdateStatistic for that */ - p_input = vlc_object_find( p_sout, VLC_OBJECT_INPUT, FIND_PARENT ); - if( !p_input || p_input->i_state == INIT_S || p_input->i_state == ERROR_S ) + /* */ + 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 ) { -#define I(c) stats_UpdateInteger( p_input, p_input->p->counters.c, i_delta, NULL ) case SOUT_STATISTIC_DECODED_VIDEO: - I(p_decoded_video); + i_input_type = SOUT_STATISTIC_DECODED_VIDEO; break; case SOUT_STATISTIC_DECODED_AUDIO: - I(p_decoded_audio); + i_input_type = SOUT_STATISTIC_DECODED_AUDIO; break; case SOUT_STATISTIC_DECODED_SUBTITLE: - I(p_decoded_sub); - break; -#if 0 - case SOUT_STATISTIC_ENCODED_VIDEO: - case SOUT_STATISTIC_ENCODED_AUDIO: - case SOUT_STATISTIC_ENCODED_SUBTITLE: - msg_Warn( p_sout, "Not yet supported statistic type %d", i_type ); + i_input_type = SOUT_STATISTIC_DECODED_SUBTITLE; break; -#endif case SOUT_STATISTIC_SENT_PACKET: - I(p_sout_sent_packets); + i_input_type = SOUT_STATISTIC_SENT_PACKET; break; -#undef I + case SOUT_STATISTIC_SENT_BYTE: - if( !stats_UpdateInteger( p_input, p_input->p->counters.p_sout_sent_bytes, i_delta, &i_bytes ) ) - stats_UpdateFloat( p_input, p_input->p->counters.p_sout_send_bitrate, i_bytes, NULL ); + i_input_type = SOUT_STATISTIC_SENT_BYTE; break; default: - msg_Err( p_sout, "Invalid statistic type %d (internal error)", i_type ); - break; + 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 ); } /***************************************************************************** @@ -218,7 +217,7 @@ sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout, msg_Dbg( p_sout, "adding a new sout input (sout_input:%p)", p_input ); - if( p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) + if( p_fmt->i_codec == VLC_CODEC_NULL ) { vlc_object_release( p_sout ); return p_input; @@ -247,7 +246,7 @@ int sout_InputDelete( sout_packetizer_input_t *p_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 ); @@ -268,12 +267,13 @@ int sout_InputSendBuffer( sout_packetizer_input_t *p_input, 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 ); @@ -288,24 +288,26 @@ int sout_InputSendBuffer( sout_packetizer_input_t *p_input, 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 ) ) ) ) + 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 ); 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->pf_seek = NULL; p_access->pf_read = NULL; @@ -319,7 +321,7 @@ sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout, vlc_object_attach( p_access, p_sout ); p_access->p_module = - module_Need( p_access, "sout access", p_access->psz_access, true ); + module_need( p_access, "sout access", p_access->psz_access, true ); if( !p_access->p_module ) { @@ -340,7 +342,7 @@ 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 ); @@ -373,6 +375,7 @@ ssize_t sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer ) *****************************************************************************/ 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; @@ -382,28 +385,39 @@ ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer ) 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 ) return NULL; @@ -429,7 +443,7 @@ sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, char *psz_mux, vlc_object_attach( p_mux, p_sout ); p_mux->p_module = - module_Need( p_mux, "sout mux", p_mux->psz_mux, true ); + module_need( p_mux, "sout mux", p_mux->psz_mux, true ); if( p_mux->p_module == NULL ) { @@ -489,7 +503,7 @@ 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 ); @@ -605,6 +619,44 @@ void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input, 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; +} + + /***************************************************************************** * *****************************************************************************/ @@ -741,50 +793,76 @@ static void mrl_Clean( mrl_t *p_mrl ) **************************************************************************** ****************************************************************************/ -/* 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 + vlc_object_detach( p_stream ); + 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) +{ + if(!p_first) + return; + + if(p_first != p_last) + sout_StreamChainDelete(p_first->p_next, p_last); + sout_StreamDelete(p_first); +} + +/* 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 ) 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, 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; } @@ -792,24 +870,95 @@ sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_chain ) 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; @@ -855,7 +1004,7 @@ rtp: } /* 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) @@ -867,3 +1016,11 @@ rtp: mrl_Clean( &mrl ); 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 ); +}