/*****************************************************************************
- * display.c
+ * display.c: display stream output module
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: display.c,v 1.2 2003/04/14 02:26:49 fenrir Exp $
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-static sout_stream_id_t *Add ( sout_stream_t *, sout_format_t * );
+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 *, sout_buffer_t* );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("Display stream") );
+ set_description( _("Display stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "display" );
set_callbacks( Open, Close );
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;
+ /* 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 );
es_descriptor_t *p_es;
};
-
-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;
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 );
- 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 = malloc( sizeof( es_descriptor_t ) );
+ memset( id->p_es, 0, sizeof( es_descriptor_t ) );
+ id->p_es->i_cat = p_fmt->i_cat;
+ id->p_es->i_fourcc = p_fmt->i_codec;
id->p_es->b_force_decoder = VLC_TRUE;
- switch( p_fmt->i_cat )
- {
- 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" );
- free( id );
- return NULL;
- }
+ es_format_Copy( &id->p_es->fmt, p_fmt );
- if( input_SelectES( p_sys->p_input, id->p_es ) )
+ id->p_es->p_dec = input_RunDecoder( p_sys->p_input, id->p_es );
+ if( id->p_es->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->p_es );
free( id );
return NULL;
}
- vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
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_EndDecoder( p_sys->p_input, id->p_es );
+ free( id->p_es );
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,
+ sout_buffer_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_block;
- if( p_buffer->i_size > 0 )
+ if( id->p_es->p_dec && p_buffer->i_size > 0 &&
+ (p_block = block_New( p_stream, p_buffer->i_size )) )
{
- 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_data->p_payload_end = p_data->p_payload_start + p_buffer->i_size;
-
- 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 );
- }
- else
- {
- input_DeletePES( p_sys->p_input->p_method_data, p_pes );
- }
+ p_block->i_dts = p_buffer->i_dts <= 0 ? 0 :
+ p_buffer->i_dts + p_sys->i_delay;
+ p_block->i_pts = p_buffer->i_pts <= 0 ? 0 :
+ p_buffer->i_pts + p_sys->i_delay;
+
+ p_stream->p_vlc->pf_memcpy( p_block->p_buffer,
+ p_buffer->p_buffer, p_buffer->i_size );
+
+ input_DecodeBlock( id->p_es->p_dec, p_block );
}
/* *** go to next buffer *** */
return VLC_SUCCESS;
}
-
projects / vlc / blobdiff