X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fdisplay.c;h=a7cf827d71177cdbb7b6b82dd63b76cd7730f854;hb=1ce4f166a9653d8ee369862ee3111cce91af815d;hp=edd9948e769c310d5916b4772d2688b66c23e3b3;hpb=4dec9682f6b5b0b6ed2d5187f4652cb680f39000;p=vlc diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c index edd9948e76..a7cf827d71 100644 --- a/modules/stream_out/display.c +++ b/modules/stream_out/display.c @@ -1,8 +1,8 @@ /***************************************************************************** - * display.c + * display.c: display stream output module ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: display.c,v 1.1 2003/04/13 20:00:21 fenrir Exp $ + * Copyright (C) 2001, 2002 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * @@ -18,47 +18,73 @@ * * 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 "codecs.h" +#include +#include +#include +#include +#include /***************************************************************************** - * Exported prototypes + * Module descriptor *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close ( vlc_object_t * ); +#define AUDIO_TEXT N_("Enable audio") +#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_LONGTEXT N_( "Introduces a delay in the display of the stream." ) + +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); + +#define SOUT_CFG_PREFIX "sout-display-" + +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, true ) + set_callbacks( Open, Close ) +vlc_module_end () -static sout_stream_id_t *Add ( sout_stream_t *, sout_format_t * ); -static int Del ( sout_stream_t *, sout_stream_id_t * ); -static int Send( sout_stream_t *, sout_stream_id_t *, sout_buffer_t* ); /***************************************************************************** - * Module descriptor + * Exported prototypes *****************************************************************************/ -vlc_module_begin(); - set_description( _("Display stream") ); - set_capability( "sout stream", 50 ); - add_shortcut( "display" ); - set_callbacks( Open, Close ); -vlc_module_end(); +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* ); 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; }; @@ -70,62 +96,52 @@ static int Open( vlc_object_t *p_this ) { sout_stream_t *p_stream = (sout_stream_t*)p_this; sout_stream_sys_t *p_sys; - char *val; - 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; - } - p_sys->b_audio = VLC_TRUE; - p_sys->b_video = VLC_TRUE; - p_sys->i_delay = 100*1000; - if( sout_cfg_find( p_stream->p_cfg, "noaudio" ) ) - { - p_sys->b_audio = VLC_FALSE; - } - if( sout_cfg_find( p_stream->p_cfg, "novideo" ) ) - { - p_sys->b_video = VLC_FALSE; - } - if( ( val = sout_cfg_find_value( p_stream->p_cfg, "delay" ) ) ) - { - p_sys->i_delay = (mtime_t)atoi( val ) * (mtime_t)1000; - } + p_sys = malloc( sizeof( sout_stream_sys_t ) ); + if( p_sys == NULL ) + return VLC_ENOMEM; + + config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, + p_stream->p_cfg ); + + 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 */ + p_stream->p_sout->i_out_pace_nocontrol++; + return VLC_SUCCESS; } /***************************************************************************** * Close: *****************************************************************************/ - 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; - vlc_object_release( p_sys->p_input ); + /* update p_sout->i_out_pace_nocontrol */ + p_stream->p_sout->i_out_pace_nocontrol--; free( p_sys ); } struct sout_stream_id_t { - es_descriptor_t *p_es; + decoder_t *p_dec; }; - -static sout_stream_id_t * Add ( sout_stream_t *p_stream, sout_format_t *p_fmt ) +static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_id_t *id; @@ -137,149 +153,74 @@ static sout_stream_id_t * Add ( sout_stream_t *p_stream, sout_format_t *p_f } id = malloc( sizeof( sout_stream_id_t ) ); - - vlc_mutex_lock( &p_sys->p_input->stream.stream_lock ); - id->p_es = input_AddES( p_sys->p_input, - NULL, /* no program */ - 12, /* es_id */ - 0 ); /* no extra data */ - - if( !id->p_es ) - { - vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock ); - - msg_Err( p_stream, "cannot create es" ); - free( id ); + if( id == NULL ) return NULL; - } - id->p_es->i_stream_id = 1; - id->p_es->i_cat = UNKNOWN_ES; //p_fmt->i_cat; - id->p_es->i_fourcc = p_fmt->i_fourcc; - id->p_es->b_force_decoder = VLC_TRUE; - switch( p_fmt->i_cat ) + + if( p_sys->i_es == 0 ) { - case AUDIO_ES: - id->p_es->p_bitmapinfoheader = NULL; - id->p_es->p_waveformatex = - malloc( sizeof( WAVEFORMATEX ) + p_fmt->i_extra_data ); -#define p_wf ((WAVEFORMATEX*)id->p_es->p_waveformatex) - p_wf->wFormatTag = WAVE_FORMAT_UNKNOWN; - p_wf->nChannels = p_fmt->i_channels; - p_wf->nSamplesPerSec = p_fmt->i_sample_rate; - p_wf->nAvgBytesPerSec= p_fmt->i_bitrate / 8; - p_wf->nBlockAlign = p_fmt->i_block_align; - p_wf->wBitsPerSample = 0; - p_wf->cbSize = p_fmt->i_extra_data; - if( p_fmt->i_extra_data > 0 ) - { - memcpy( &p_wf[1], - p_fmt->p_extra_data, - p_fmt->i_extra_data ); - } -#undef p_wf - break; - case VIDEO_ES: - id->p_es->p_waveformatex = NULL; - id->p_es->p_bitmapinfoheader = malloc( sizeof( BITMAPINFOHEADER ) + p_fmt->i_extra_data ); -#define p_bih ((BITMAPINFOHEADER*)id->p_es->p_bitmapinfoheader) - p_bih->biSize = sizeof( BITMAPINFOHEADER ) + p_fmt->i_extra_data; - p_bih->biWidth = p_fmt->i_width; - p_bih->biHeight = p_fmt->i_height; - p_bih->biPlanes = 0; - p_bih->biBitCount = 0; - p_bih->biCompression = 0; - p_bih->biSizeImage = 0; - p_bih->biXPelsPerMeter = 0; - p_bih->biYPelsPerMeter = 0; - p_bih->biClrUsed = 0; - p_bih->biClrImportant = 0; - if( p_fmt->i_extra_data > 0 ) - { - memcpy( &p_bih[1], - p_fmt->p_extra_data, - p_fmt->i_extra_data ); - } -#undef p_bih - break; - default: - msg_Err( p_stream, "unknown es type" ); + 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; + } } - if( input_SelectES( p_sys->p_input, id->p_es ) ) + id->p_dec = input_DecoderNew( p_sys->p_input, p_fmt, NULL, NULL ); + if( id->p_dec == NULL ) { - input_DelES( p_sys->p_input, id->p_es ); - vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock ); - - msg_Err( p_stream, "cannot select es" ); + 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; } - vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock ); + p_sys->i_es++; return id; } -static int Del ( sout_stream_t *p_stream, sout_stream_id_t *id ) +static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) { - sout_stream_sys_t *p_sys = p_stream->p_sys; - - input_DelES( p_sys->p_input, id->p_es ); + 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; } -static int Send ( sout_stream_t *p_stream, sout_stream_id_t *id, sout_buffer_t *p_buffer ) +static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *p_buffer ) { sout_stream_sys_t *p_sys = p_stream->p_sys; while( p_buffer ) { - sout_buffer_t *p_next; - pes_packet_t *p_pes; - data_packet_t *p_data; + block_t *p_next = p_buffer->p_next; - if( p_buffer->i_size > 0 ) + p_buffer->p_next = NULL; + + if( id->p_dec && p_buffer->i_buffer > 0 ) { - if( !( p_pes = input_NewPES( p_sys->p_input->p_method_data ) ) ) - { - msg_Err( p_stream, "cannot allocate new PES" ); - return VLC_EGENERIC; - } - if( !( p_data = input_NewPacket( p_sys->p_input->p_method_data, p_buffer->i_size ) ) ) - { - msg_Err( p_stream, "cannot allocate new data_packet" ); - return VLC_EGENERIC; - } - p_pes->i_dts = p_buffer->i_dts + p_sys->i_delay; - p_pes->i_pts = p_buffer->i_pts + p_sys->i_delay; - p_pes->p_first = p_pes->p_last = p_data; - p_pes->i_nb_data = 1; - p_pes->i_pes_size = p_buffer->i_size; - - p_stream->p_vlc->pf_memcpy( p_data->p_payload_start, - p_buffer->p_buffer, - p_buffer->i_size ); - - if( id->p_es->p_decoder_fifo ) - { - input_DecodePES( id->p_es->p_decoder_fifo, p_pes ); - } + 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 <= VLC_TS_INVALID ) + p_buffer->i_pts = 0; else - { - input_DeletePES( p_sys->p_input->p_method_data, p_pes ); - } + p_buffer->i_pts += p_sys->i_delay; + + input_DecoderDecode( id->p_dec, p_buffer, false ); } - /* *** go to next buffer *** */ - p_next = p_buffer->p_next; - sout_BufferDelete( p_stream->p_sout, p_buffer ); p_buffer = p_next; } return VLC_SUCCESS; } -