X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fstream_output%2Fstream_output.c;h=bbc22bd7820c213d1927a3dfc856135e99cdc2a6;hb=53b1f0600ec223109dac75467844a751b8da412d;hp=be9b71ecb0a5a0852430792f0dfc09a41b2fcddd;hpb=85c4fe7dc669c95aab4090ab65820714cc5c3e79;p=vlc diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index be9b71ecb0..bbc22bd782 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -1,26 +1,26 @@ /***************************************************************************** * 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 * Laurent Aimar * Eric Petit * - * 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. *****************************************************************************/ /***************************************************************************** @@ -82,7 +82,6 @@ static void mrl_Clean( mrl_t *p_mrl ); *****************************************************************************/ 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; @@ -99,25 +98,22 @@ sout_instance_t *sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest 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 ); 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_StreamChainNew( p_sout, psz_chain, NULL, NULL ); @@ -132,6 +128,7 @@ sout_instance_t *sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest FREENULL( p_sout->psz_sout ); + vlc_mutex_destroy( &p_sout->lock ); vlc_object_release( p_sout ); return NULL; } @@ -147,62 +144,12 @@ void sout_DeleteInstance( sout_instance_t * p_sout ) /* *** free all string *** */ FREENULL( p_sout->psz_sout ); - /* delete meta */ - if( p_sout->p_meta ) - { - vlc_meta_Delete( p_sout->p_meta ); - } - vlc_mutex_destroy( &p_sout->lock ); /* *** free structure *** */ 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 = INPUT_STATISTIC_DECODED_VIDEO; - break; - case SOUT_STATISTIC_DECODED_AUDIO: - i_input_type = INPUT_STATISTIC_DECODED_AUDIO; - break; - case SOUT_STATISTIC_DECODED_SUBTITLE: - i_input_type = INPUT_STATISTIC_DECODED_SUBTITLE; - break; - - case SOUT_STATISTIC_SENT_PACKET: - i_input_type = INPUT_STATISTIC_SENT_PACKET; - break; - - case SOUT_STATISTIC_SENT_BYTE: - i_input_type = INPUT_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 *****************************************************************************/ @@ -297,12 +244,10 @@ int sout_InputSendBuffer( sout_packetizer_input_t *p_input, 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; @@ -317,11 +262,6 @@ sout_access_out_t *sout_AccessOutNew( vlc_object_t *p_sout, 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 ); @@ -375,17 +315,6 @@ 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; - 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 ); } @@ -412,12 +341,10 @@ int sout_AccessOutControl (sout_access_out_t *access, int query, ...) 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; @@ -440,8 +367,6 @@ sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, const char *psz_mux, 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 ); @@ -530,7 +455,6 @@ sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux, es_format_t *p_fmt ) 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_input->p_sys = NULL; @@ -588,17 +512,18 @@ void sout_MuxDeleteStream( sout_mux_t *p_mux, sout_input_t *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 ) @@ -606,15 +531,15 @@ void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input, 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 ); } @@ -632,14 +557,7 @@ int sout_MuxGetStream( sout_mux_t *p_mux, int i_blocks, mtime_t *pi_dts ) 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 ) @@ -685,7 +603,7 @@ static int mrl_Parse( mrl_t *p_mrl, const char *psz_mrl ) 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", @@ -794,9 +712,14 @@ static void mrl_Clean( mrl_t *p_mrl ) /* 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); + msg_Dbg( p_stream, "destroying chain... (name=%s)", p_stream->psz_name ); - if( p_stream->p_module ) module_unneed( p_stream, p_stream->p_module ); + 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 ); @@ -833,26 +756,23 @@ void sout_StreamChainDelete(sout_stream_t *p_first, sout_stream_t *p_last) 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; 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_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 ); @@ -866,6 +786,7 @@ static sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_name, return NULL; } + p_sout->i_out_pace_nocontrol += p_stream->pace_nocontrol; return p_stream; } @@ -1019,7 +940,5 @@ rtp: #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" ); }