X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fdisplay.c;h=246fd3ba8b41c94bebb9813d9f9b8865ad9ee5f5;hb=63be579eeafa2a1fddb3df95974b8d4bba4013dd;hp=da65780ecd2ffa178a3edc487bd902d6c9b5248b;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c index da65780ecd..246fd3ba8b 100644 --- a/modules/stream_out/display.c +++ b/modules/stream_out/display.c @@ -1,35 +1,38 @@ /***************************************************************************** * display.c: display stream output module ***************************************************************************** - * Copyright (C) 2001, 2002 the VideoLAN team - * $Id$ + * Copyright (C) 2001-2011 VLC authors and VideoLAN * * Authors: Laurent Aimar * - * 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. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include /***************************************************************************** * Module descriptor @@ -38,7 +41,7 @@ #define AUDIO_LONGTEXT N_( "Enable/disable audio rendering." ) #define VIDEO_TEXT N_("Enable video") #define VIDEO_LONGTEXT N_( "Enable/disable video rendering." ) -#define DELAY_TEXT N_("Delay") +#define DELAY_TEXT N_("Delay (ms)") #define DELAY_LONGTEXT N_( "Introduces a delay in the display of the stream." ) static int Open ( vlc_object_t * ); @@ -46,42 +49,42 @@ 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 ); - add_integer( SOUT_CFG_PREFIX "delay", 100, NULL, DELAY_TEXT, - DELAY_LONGTEXT, VLC_TRUE ); - set_callbacks( Open, Close ); -vlc_module_end(); +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, AUDIO_TEXT, + AUDIO_LONGTEXT, true ) + add_bool( SOUT_CFG_PREFIX "video", true, VIDEO_TEXT, + VIDEO_LONGTEXT, true ) + add_integer( SOUT_CFG_PREFIX "delay", 100, DELAY_TEXT, + 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 }; -static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * ); -static int Del ( sout_stream_t *, sout_stream_id_t * ); -static int Send( sout_stream_t *, sout_stream_id_t *, block_t* ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); +static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); +static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); struct sout_stream_sys_t { - input_thread_t *p_input; - - vlc_bool_t b_audio; - vlc_bool_t b_video; + bool b_audio; + bool b_video; mtime_t i_delay; + input_resource_t *p_resource; }; /***************************************************************************** @@ -91,38 +94,31 @@ 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 ) ); + if( p_sys == NULL ) + return VLC_ENOMEM; - p_sys = malloc( sizeof( sout_stream_sys_t ) ); - p_sys->p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT, - FIND_PARENT ); - if( !p_sys->p_input ) + p_sys->p_resource = input_resource_New( p_this ); + if( unlikely(p_sys->p_resource == NULL) ) { - msg_Err( p_stream, "cannot find p_input" ); free( p_sys ); - return VLC_EGENERIC; + return VLC_ENOMEM; } - var_Get( p_stream, SOUT_CFG_PREFIX "audio", &val ); - p_sys->b_audio = val.b_bool; - - 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->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 = p_sys->i_delay * CLOCK_FREQ / 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 */ - p_stream->p_sout->i_out_pace_nocontrol++; + p_stream->pace_nocontrol = true; return VLC_SUCCESS; } @@ -135,22 +131,14 @@ static void Close( vlc_object_t * p_this ) sout_stream_t *p_stream = (sout_stream_t*)p_this; sout_stream_sys_t *p_sys = p_stream->p_sys; - /* update p_sout->i_out_pace_nocontrol */ - p_stream->p_sout->i_out_pace_nocontrol--; - - vlc_object_release( p_sys->p_input ); + input_resource_Terminate( p_sys->p_resource ); + input_resource_Release( p_sys->p_resource ); free( p_sys ); } -struct sout_stream_id_t -{ - decoder_t *p_dec; -}; - -static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; - sout_stream_id_t *id; if( ( p_fmt->i_cat == AUDIO_ES && !p_sys->b_audio )|| ( p_fmt->i_cat == VIDEO_ES && !p_sys->b_video ) ) @@ -158,28 +146,24 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) return NULL; } - id = malloc( sizeof( sout_stream_id_t ) ); - - id->p_dec = input_DecoderNew( p_sys->p_input, p_fmt, VLC_TRUE ); - if( id->p_dec == NULL ) + decoder_t *p_dec = input_DecoderCreate( VLC_OBJECT(p_stream), p_fmt, + p_sys->p_resource ); + if( p_dec == NULL ) { msg_Err( p_stream, "cannot create decoder for fcc=`%4.4s'", (char*)&p_fmt->i_codec ); - free( id ); return NULL; } - - return id; + return (sout_stream_id_sys_t *)p_dec; } -static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) +static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id ) { - input_DecoderDelete( id->p_dec ); - free( id ); - return VLC_SUCCESS; + (void) p_stream; + input_DecoderDelete( (decoder_t *)id ); } -static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, +static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id, block_t *p_buffer ) { sout_stream_sys_t *p_sys = p_stream->p_sys; @@ -190,19 +174,19 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, p_buffer->p_next = NULL; - if( id->p_dec && p_buffer->i_buffer > 0 ) + if( id != NULL && 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( (decoder_t *)id, p_buffer, false ); } p_buffer = p_next;