X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fstream_output%2Fstream_output.c;h=2e11974064ffc4f99024d36f1084b6dcef4fb9b5;hb=ab95c5fa064411a759f64538b721c8443f5b733f;hp=2d512e664eafad2a7bf2f56c3f8f026b9290be7e;hpb=c4d19b859876eee3510940ae172d66d4723ba1a8;p=vlc diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index 2d512e664e..2e11974064 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -27,6 +27,10 @@ * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include /* free() */ @@ -48,7 +52,7 @@ *****************************************************************************/ #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( vlc_object_t *, const char * ); /* * Generic MRL parser @@ -88,7 +92,7 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest ) p_sout->i_out_pace_nocontrol = 0; p_sout->p_sys = NULL; - vlc_mutex_init( p_sout, &p_sout->lock ); + vlc_mutex_init( &p_sout->lock ); if( psz_dest && psz_dest[0] == '#' ) { p_sout->psz_chain = strdup( &psz_dest[1] ); @@ -116,7 +120,7 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest ) FREENULL( p_sout->psz_chain ); vlc_object_detach( p_sout ); - vlc_object_destroy( p_sout ); + vlc_object_release( p_sout ); return NULL; } @@ -144,9 +148,62 @@ void sout_DeleteInstance( sout_instance_t * p_sout ) 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 ) +{ + input_thread_t *p_input; + int i_bytes; /* That's pretty stupid to define it as an integer, it will overflow + really fast ... */ + + if( !p_sout->p_libvlc->b_stats ) + 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 ) + return; + + 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); + break; + case SOUT_STATISTIC_DECODED_AUDIO: + I(p_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 ); + break; +#endif + + case SOUT_STATISTIC_SENT_PACKET: + I(p_sout_sent_packets); + 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 ); + break; + + default: + msg_Err( p_sout, "Invalid statistic type %d (internal error)", i_type ); + break; + } + vlc_object_release( p_input ); +} /***************************************************************************** * Packetizer/Input *****************************************************************************/ @@ -155,13 +212,13 @@ sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout, { 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 ) ); p_input->p_sout = p_sout; p_input->p_fmt = p_fmt; + 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' ) ) { vlc_object_release( p_sout ); @@ -189,7 +246,7 @@ int sout_InputDelete( sout_packetizer_input_t *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' ) ) { @@ -250,10 +307,7 @@ sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout, 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; @@ -269,14 +323,14 @@ 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, 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 ); } @@ -298,7 +352,7 @@ void sout_AccessOutDelete( sout_access_out_t *p_access ) free( p_access->psz_path ); - vlc_object_destroy( p_access ); + vlc_object_release( p_access ); } /***************************************************************************** @@ -312,7 +366,7 @@ int sout_AccessOutSeek( sout_access_out_t *p_access, off_t i_pos ) /***************************************************************************** * 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 ); @@ -321,28 +375,16 @@ int sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer ) /***************************************************************************** * 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; + 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; } return p_access->pf_write( p_access, p_buffer ); } @@ -374,7 +416,7 @@ sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, char *psz_mux, 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; @@ -387,58 +429,58 @@ sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, char *psz_mux, 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; } } } @@ -460,7 +502,7 @@ void sout_MuxDelete( sout_mux_t *p_mux ) config_ChainDestroy( p_mux->p_cfg ); - vlc_object_destroy( p_mux ); + vlc_object_release( p_mux ); } /***************************************************************************** @@ -481,19 +523,24 @@ sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux, es_format_t *p_fmt ) /* create a new sout input */ p_input = malloc( sizeof( sout_input_t ) ); + if( !p_input ) + { + msg_Err( p_mux, "out of memory" ); + 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; @@ -511,7 +558,7 @@ void sout_MuxDeleteStream( sout_mux_t *p_mux, sout_input_t *p_input ) { /* 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 ); } @@ -548,13 +595,13 @@ void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input, { 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" ) * I64C(1000); + 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; @@ -563,7 +610,7 @@ void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input, 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 = VLC_FALSE; + p_mux->b_waiting_stream = false; } p_mux->pf_mux( p_mux ); } @@ -714,41 +761,6 @@ static void mrl_Clean( mrl_t *p_mrl ) * 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 ) -{ - char c, *p = str; - - SKIPSPACE( p ); - - for( ;; ) - { - if( !*p || *p == ',' || *p == '}' ) return p; - - if( *p != '{' && *p != '"' && *p != '\'' ) - { - p++; - continue; - } - - if( *p == '{' ) c = '}'; - else c = *p; - p++; - - for( ;; ) - { - if( !*p ) return p; - - if( *p == c ) return ++p; - else if( *p == '{' && c == '}' ) p = _get_chain_end( p ); - else p++; - } - } -} /* * XXX name and p_cfg are used (-> do NOT free them) @@ -782,7 +794,7 @@ sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_chain ) 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 ) { @@ -806,32 +818,52 @@ void sout_StreamDelete( sout_stream_t *p_stream ) config_ChainDestroy( p_stream->p_cfg ); msg_Dbg( p_stream, "destroying chain done" ); - vlc_object_destroy( p_stream ); + vlc_object_release( p_stream ); } -static char *_sout_stream_url_to_chain( vlc_object_t *p_this, char *psz_url ) +static char *_sout_stream_url_to_chain( vlc_object_t *p_this, + const char *psz_url ) { mrl_t mrl; - char *psz_chain, *p; + char *psz_chain; + const char *fmt = "standard{mux=\"%s\",access=\"%s\",dst=\"%s\"}"; + static const char rtpfmt[] = "rtp{mux=\"%s\",proto=\"%s\",dst=\"%s\"}"; mrl_Parse( &mrl, psz_url ); - p = psz_chain = malloc( 500 + strlen( mrl.psz_way ) + - strlen( mrl.psz_access ) + - strlen( mrl.psz_name ) ); - - if( config_GetInt( p_this, "sout-display" ) ) + /* Check if the URLs goes #rtp - otherwise we'll use #standard */ + 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 ); + /* For historical reasons, rtp:// means RTP over UDP */ + strcpy (mrl.psz_access, "udp"); + fmt = rtpfmt; } else { - p += sprintf( p, "std{mux=\"%s\",access=\"%s\",dst=\"%s\"}", - mrl.psz_way, mrl.psz_access, mrl.psz_name ); + static const char list[] = "dccp\0sctp\0tcp\0udplite\0"; + for (const char *a = list; *a; a += strlen (a) + 1) + if (strcmp (a, mrl.psz_access) == 0) + { + fmt = rtpfmt; + break; + } + } + + /* Convert the URL to a basic sout chain */ + if (asprintf (&psz_chain, fmt, + mrl.psz_way, mrl.psz_access, mrl.psz_name) == -1) + psz_chain = NULL; + + /* Duplicate and wrap if sout-display is on */ + if (psz_chain && (config_GetInt( p_this, "sout-display" ) > 0)) + { + char *tmp; + if (asprintf (&tmp, "duplicate{dst=display,dst=%s}", tmp) == -1) + tmp = NULL; + free (psz_chain); + psz_chain = tmp; } mrl_Clean( &mrl ); - return( psz_chain ); + return psz_chain; }