X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fdisplay.c;h=a7cf827d71177cdbb7b6b82dd63b76cd7730f854;hb=HEAD;hp=d19617fc365d6f829226481f1368f8decb0cc2b7;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c index d19617fc36..a7cf827d71 100644 --- a/modules/stream_out/display.c +++ b/modules/stream_out/display.c @@ -1,7 +1,7 @@ /***************************************************************************** * display.c: display stream output module ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN (Centrale Réseaux) and its contributors + * Copyright (C) 2001, 2002 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,18 +18,22 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include /***************************************************************************** * Module descriptor @@ -46,27 +50,27 @@ static void Close( vlc_object_t * ); #define SOUT_CFG_PREFIX "sout-display-" -vlc_module_begin(); - set_shortname( _("Display")); - set_description( _("Display stream output") ); - set_capability( "sout stream", 50 ); - add_shortcut( "display" ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_STREAM ); - add_bool( SOUT_CFG_PREFIX "audio", 1, NULL, AUDIO_TEXT, - AUDIO_LONGTEXT, VLC_TRUE ); - add_bool( SOUT_CFG_PREFIX "video", 1, NULL, VIDEO_TEXT, - VIDEO_LONGTEXT, VLC_TRUE ); +vlc_module_begin () + set_shortname( N_("Display")) + set_description( N_("Display stream output") ) + set_capability( "sout stream", 50 ) + add_shortcut( "display" ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_STREAM ) + add_bool( SOUT_CFG_PREFIX "audio", true, NULL, AUDIO_TEXT, + AUDIO_LONGTEXT, true ) + add_bool( SOUT_CFG_PREFIX "video", true, NULL, VIDEO_TEXT, + VIDEO_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "delay", 100, NULL, DELAY_TEXT, - DELAY_LONGTEXT, VLC_TRUE ); - set_callbacks( Open, Close ); -vlc_module_end(); + DELAY_LONGTEXT, true ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Exported prototypes *****************************************************************************/ -static const char *ppsz_sout_options[] = { +static const char *const ppsz_sout_options[] = { "audio", "video", "delay", NULL }; @@ -77,9 +81,10 @@ static int Send( sout_stream_t *, sout_stream_id_t *, block_t* ); struct sout_stream_sys_t { input_thread_t *p_input; + unsigned i_es; - vlc_bool_t b_audio; - vlc_bool_t b_video; + bool b_audio; + bool b_video; mtime_t i_delay; }; @@ -91,34 +96,24 @@ static int Open( vlc_object_t *p_this ) { sout_stream_t *p_stream = (sout_stream_t*)p_this; sout_stream_sys_t *p_sys; - vlc_value_t val; - - sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, - p_stream->p_cfg ); - - p_sys = malloc( sizeof( sout_stream_sys_t ) ); - p_sys->p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT, - FIND_ANYWHERE ); - if( !p_sys->p_input ) - { - msg_Err( p_stream, "cannot find p_input" ); - free( p_sys ); - return VLC_EGENERIC; - } - var_Get( p_stream, SOUT_CFG_PREFIX "audio", &val ); - p_sys->b_audio = val.b_bool; + p_sys = malloc( sizeof( sout_stream_sys_t ) ); + if( p_sys == NULL ) + return VLC_ENOMEM; - var_Get( p_stream, SOUT_CFG_PREFIX "video", &val ); - p_sys->b_video = val.b_bool; + config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, + p_stream->p_cfg ); - var_Get( p_stream, SOUT_CFG_PREFIX "delay", &val ); - p_sys->i_delay = (int64_t)val.i_int * 1000; + p_sys->p_input = NULL; + p_sys->i_es = 0; + p_sys->b_audio = var_GetBool( p_stream, SOUT_CFG_PREFIX"audio" ); + p_sys->b_video = var_GetBool( p_stream, SOUT_CFG_PREFIX "video" ); + p_sys->i_delay = var_GetInteger( p_stream, SOUT_CFG_PREFIX "delay" ); + p_sys->i_delay *= 1000; p_stream->pf_add = Add; p_stream->pf_del = Del; p_stream->pf_send = Send; - p_stream->p_sys = p_sys; /* update p_sout->i_out_pace_nocontrol */ @@ -138,7 +133,6 @@ static void Close( vlc_object_t * p_this ) /* update p_sout->i_out_pace_nocontrol */ p_stream->p_sout->i_out_pace_nocontrol--; - vlc_object_release( p_sys->p_input ); free( p_sys ); } @@ -159,22 +153,42 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) } id = malloc( sizeof( sout_stream_id_t ) ); + if( id == NULL ) + return NULL; - id->p_dec = input_DecoderNew( p_sys->p_input, p_fmt, VLC_TRUE ); + if( p_sys->i_es == 0 ) + { + p_sys->p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT, + FIND_PARENT ); + if( p_sys->p_input == NULL ) + { + msg_Err( p_stream, "cannot find input" ); + free( id ); + return NULL; + } + } + + id->p_dec = input_DecoderNew( p_sys->p_input, p_fmt, NULL, NULL ); if( id->p_dec == NULL ) { msg_Err( p_stream, "cannot create decoder for fcc=`%4.4s'", (char*)&p_fmt->i_codec ); free( id ); + if( p_sys->i_es == 0 ) + vlc_object_release( p_sys->p_input ); return NULL; } + p_sys->i_es++; return id; } static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) { input_DecoderDelete( id->p_dec ); + if( --p_stream->p_sys->i_es == 0) + vlc_object_release( p_stream->p_sys->p_input ); + free( id ); return VLC_SUCCESS; } @@ -192,17 +206,17 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, if( id->p_dec && p_buffer->i_buffer > 0 ) { - if( p_buffer->i_dts <= 0 ) - p_buffer->i_dts= 0; + if( p_buffer->i_dts <= VLC_TS_INVALID ) + p_buffer->i_dts = 0; else p_buffer->i_dts += p_sys->i_delay; - if( p_buffer->i_pts <= 0 ) - p_buffer->i_pts= 0; + if( p_buffer->i_pts <= VLC_TS_INVALID ) + p_buffer->i_pts = 0; else p_buffer->i_pts += p_sys->i_delay; - input_DecoderDecode( id->p_dec, p_buffer ); + input_DecoderDecode( id->p_dec, p_buffer, false ); } p_buffer = p_next;