* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
- * Gildas Bazin <gbazin@netcourrier.com>
+ * Gildas Bazin <gbazin@videolan.org>
* Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
static void vout_link_picture( decoder_t *, picture_t * );
static void vout_unlink_picture( decoder_t *, picture_t * );
+static subpicture_t *spu_new_buffer( decoder_t * );
+static void spu_del_buffer( decoder_t *, subpicture_t * );
+
static es_format_t null_es_format = {0};
struct decoder_owner_sys_t
{
vlc_bool_t b_own_thread;
+ int64_t i_preroll_end;
+
input_thread_t *p_input;
aout_instance_t *p_aout;
vout_thread_t *p_vout;
+ vout_thread_t *p_spu_vout;
+ int i_spu_channel;
+
sout_instance_t *p_sout;
sout_packetizer_input_t *p_sout_input;
}
else
{
+ /* Flush */
+ input_DecoderDecode( p_dec, NULL );
+
module_Unneed( p_dec, p_dec->p_module );
}
{
if( p_dec->p_owner->b_own_thread )
{
- block_FifoPut( p_dec->p_owner->p_fifo, p_block );
-
if( p_dec->p_owner->p_input->b_out_pace_control )
{
/* FIXME !!!!! */
msleep( 1000 );
}
}
+ else if( p_dec->p_owner->p_fifo->i_size > 50000000 /* 50 MB */ )
+ {
+ /* FIXME: ideally we would check the time amount of data
+ * in the fifo instead of its size. */
+ msg_Warn( p_dec, "decoder/packetizer fifo full (data not "
+ "consummed quickly enough), resetting fifo!" );
+ block_FifoEmpty( p_dec->p_owner->p_fifo );
+ }
+
+ block_FifoPut( p_dec->p_owner->p_fifo, p_block );
}
else
{
- if( p_dec->b_error || p_block->i_buffer <= 0 )
+ if( p_dec->b_error || (p_block && p_block->i_buffer <= 0) )
{
- block_Release( p_block );
+ if( p_block ) block_Release( p_block );
}
else
{
return VLC_TRUE;
}
+void input_DecoderPreroll( decoder_t *p_dec, int64_t i_preroll_end )
+{
+ p_dec->p_owner->i_preroll_end = i_preroll_end;
+}
+
#if 0
/**
* Create a NULL packet for padding in case of a data loss
return NULL;
}
p_dec->p_owner->b_own_thread = VLC_TRUE;
+ p_dec->p_owner->i_preroll_end = -1;
p_dec->p_owner->p_input = p_input;
p_dec->p_owner->p_aout = NULL;
p_dec->p_owner->p_aout_input = NULL;
p_dec->p_owner->p_vout = NULL;
+ p_dec->p_owner->p_spu_vout = NULL;
+ p_dec->p_owner->i_spu_channel = 0;
p_dec->p_owner->p_sout = p_input->p_sout;
p_dec->p_owner->p_sout_input = NULL;
p_dec->p_owner->p_packetizer = NULL;
-
/* decoder fifo */
if( ( p_dec->p_owner->p_fifo = block_FifoNew( p_dec ) ) == NULL )
{
msg_Err( p_dec, "out of memory" );
return NULL;
}
+
/* Set buffers allocation callbacks for the decoders */
p_dec->pf_aout_buffer_new = aout_new_buffer;
p_dec->pf_aout_buffer_del = aout_del_buffer;
p_dec->pf_vout_buffer_del = vout_del_buffer;
p_dec->pf_picture_link = vout_link_picture;
p_dec->pf_picture_unlink = vout_unlink_picture;
+ p_dec->pf_spu_buffer_new = spu_new_buffer;
+ p_dec->pf_spu_buffer_del = spu_del_buffer;
vlc_object_attach( p_dec, p_input );
*/
static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
{
- if( p_block->i_buffer <= 0 )
+ int i_rate = p_block ? p_block->i_rate : 1000;
+
+ if( p_block && p_block->i_buffer <= 0 )
{
block_Release( p_block );
return VLC_SUCCESS;
{
block_t *p_sout_block;
- while( (p_sout_block = p_dec->pf_packetize( p_dec, &p_block )) )
+ while( ( p_sout_block =
+ p_dec->pf_packetize( p_dec, p_block ? &p_block : 0 ) ) )
{
if( !p_dec->p_owner->p_sout_input )
{
es_format_Copy( &p_dec->p_owner->sout, &p_dec->fmt_out );
- p_dec->p_owner->sout.i_group =p_dec->fmt_in.i_group;
+ p_dec->p_owner->sout.i_group = p_dec->fmt_in.i_group;
p_dec->p_owner->sout.i_id = p_dec->fmt_in.i_id;
if( p_dec->fmt_in.psz_language )
{
while( p_sout_block )
{
- block_t *p_next = p_sout_block->p_next;
+ block_t *p_next = p_sout_block->p_next;
p_sout_block->p_next = NULL;
+ p_sout_block->i_rate = i_rate;
sout_InputSendBuffer( p_dec->p_owner->p_sout_input,
p_sout_block );
while( (p_packetized_block =
p_packetizer->pf_packetize( p_packetizer, &p_block )) )
{
- while( (p_aout_buf =
- p_dec->pf_decode_audio( p_dec, &p_packetized_block )) )
+ if( p_packetizer->fmt_out.i_extra && !p_dec->fmt_in.i_extra )
+ {
+ p_dec->fmt_in.i_extra = p_packetizer->fmt_out.i_extra;
+ p_dec->fmt_in.p_extra = malloc( p_dec->fmt_in.i_extra );
+ memcpy( p_dec->fmt_in.p_extra,
+ p_packetizer->fmt_out.p_extra,
+ p_dec->fmt_in.i_extra );
+ }
+
+ while( p_packetized_block )
{
- aout_DecPlay( p_dec->p_owner->p_aout,
- p_dec->p_owner->p_aout_input, p_aout_buf );
+ block_t *p_next = p_packetized_block->p_next;
+ p_packetized_block->p_next = NULL;
+ p_packetized_block->i_rate = i_rate;
+
+ while( (p_aout_buf = p_dec->pf_decode_audio( p_dec,
+ &p_packetized_block )) )
+ {
+ /* FIXME the best would be to handle the case start_date < preroll < end_date
+ * but that's not easy with non raw audio stream */
+ if( p_dec->p_owner->i_preroll_end > 0 &&
+ p_aout_buf->start_date < p_dec->p_owner->i_preroll_end )
+ {
+ aout_DecDeleteBuffer( p_dec->p_owner->p_aout,
+ p_dec->p_owner->p_aout_input, p_aout_buf );
+ }
+ else
+ {
+ p_dec->p_owner->i_preroll_end = -1;
+ aout_DecPlay( p_dec->p_owner->p_aout,
+ p_dec->p_owner->p_aout_input,
+ p_aout_buf );
+ }
+ }
+
+ p_packetized_block = p_next;
}
}
}
else while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
{
- aout_DecPlay( p_dec->p_owner->p_aout,
- p_dec->p_owner->p_aout_input, p_aout_buf );
+ if( p_dec->p_owner->i_preroll_end > 0 &&
+ p_aout_buf->start_date < p_dec->p_owner->i_preroll_end )
+ {
+ aout_DecDeleteBuffer( p_dec->p_owner->p_aout,
+ p_dec->p_owner->p_aout_input, p_aout_buf );
+ }
+ else
+ {
+ p_dec->p_owner->i_preroll_end = -1;
+ aout_DecPlay( p_dec->p_owner->p_aout,
+ p_dec->p_owner->p_aout_input,
+ p_aout_buf );
+ }
}
}
else if( p_dec->fmt_in.i_cat == VIDEO_ES )
while( (p_packetized_block =
p_packetizer->pf_packetize( p_packetizer, &p_block )) )
{
- while( (p_pic =
- p_dec->pf_decode_video( p_dec, &p_packetized_block )) )
+ while( p_packetized_block )
{
- vout_DatePicture( p_dec->p_owner->p_vout, p_pic,
- p_pic->date );
- vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
+ block_t *p_next = p_packetized_block->p_next;
+ p_packetized_block->p_next = NULL;
+ p_packetized_block->i_rate = i_rate;
+
+ while( (p_pic = p_dec->pf_decode_video( p_dec,
+ &p_packetized_block )) )
+ {
+ if( p_dec->p_owner->i_preroll_end > 0 &&
+ p_pic->date < p_dec->p_owner->i_preroll_end )
+ {
+ vout_DestroyPicture( p_dec->p_owner->p_vout, p_pic );
+ }
+ else
+ {
+ p_dec->p_owner->i_preroll_end = -1;
+ vout_DatePicture( p_dec->p_owner->p_vout, p_pic,
+ p_pic->date );
+ vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
+ }
+ }
+
+ p_packetized_block = p_next;
}
}
}
else while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
{
- vout_DatePicture( p_dec->p_owner->p_vout, p_pic, p_pic->date );
- vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
+ if( p_dec->p_owner->i_preroll_end > 0 &&
+ p_pic->date < p_dec->p_owner->i_preroll_end )
+ {
+ vout_DestroyPicture( p_dec->p_owner->p_vout, p_pic );
+ }
+ else
+ {
+ p_dec->p_owner->i_preroll_end = -1;
+ vout_DatePicture( p_dec->p_owner->p_vout, p_pic, p_pic->date );
+ vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
+ }
}
}
else if( p_dec->fmt_in.i_cat == SPU_ES )
{
- p_dec->pf_decode_sub( p_dec, &p_block );
+ vout_thread_t *p_vout;
+ subpicture_t *p_spu;
+ while( (p_spu = p_dec->pf_decode_sub( p_dec, &p_block ) ) )
+ {
+ if( p_dec->p_owner->i_preroll_end > 0 &&
+ p_spu->i_start < p_dec->p_owner->i_preroll_end &&
+ ( p_spu->i_stop <= 0 || p_spu->i_stop <= p_dec->p_owner->i_preroll_end ) )
+ {
+ spu_DestroySubpicture( p_dec->p_owner->p_vout->p_spu, p_spu );
+ continue;
+ }
+
+ p_dec->p_owner->i_preroll_end = -1;
+ p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ if( p_vout )
+ {
+ spu_DisplaySubpicture( p_vout->p_spu, p_spu );
+ vlc_object_release( p_vout );
+ }
+ }
}
else
{
*/
static void DeleteDecoder( decoder_t * p_dec )
{
- vlc_object_detach( p_dec );
-
msg_Dbg( p_dec, "killing decoder fourcc `%4.4s', %d PES in FIFO",
(char*)&p_dec->fmt_in.i_codec,
p_dec->p_owner->p_fifo->i_depth );
block_FifoEmpty( p_dec->p_owner->p_fifo );
block_FifoRelease( p_dec->p_owner->p_fifo );
- /* Cleanup */
+ /* Cleanup */
if( p_dec->p_owner->p_aout_input )
aout_DecDelete( p_dec->p_owner->p_aout, p_dec->p_owner->p_aout_input );
#undef p_pic
/* We are about to die. Reattach video output to p_vlc. */
- vout_Request( p_dec, p_dec->p_owner->p_vout, 0, 0, 0, 0 );
+ vout_Request( p_dec, p_dec->p_owner->p_vout, 0 );
}
if( p_dec->p_owner->p_sout_input )
es_format_Clean( &p_dec->p_owner->sout );
}
+ if( p_dec->fmt_in.i_cat == SPU_ES )
+ {
+ vout_thread_t *p_vout;
+
+ p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ if( p_vout )
+ {
+ spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR,
+ p_dec->p_owner->i_spu_channel );
+ vlc_object_release( p_vout );
+ }
+ }
+
es_format_Clean( &p_dec->fmt_in );
es_format_Clean( &p_dec->fmt_out );
vlc_object_destroy( p_dec->p_owner->p_packetizer );
}
+ vlc_object_detach( p_dec );
+
free( p_dec->p_owner );
}
return NULL;
}
+ if( !p_dec->fmt_out.video.i_sar_num ||
+ !p_dec->fmt_out.video.i_sar_den )
+ {
+ p_dec->fmt_out.video.i_sar_num =
+ p_dec->fmt_out.video.i_aspect * p_dec->fmt_out.video.i_height;
+
+ p_dec->fmt_out.video.i_sar_den = VOUT_ASPECT_FACTOR *
+ p_dec->fmt_out.video.i_width;
+ }
+
+ vlc_reduce( &p_dec->fmt_out.video.i_sar_num,
+ &p_dec->fmt_out.video.i_sar_den,
+ p_dec->fmt_out.video.i_sar_num,
+ p_dec->fmt_out.video.i_sar_den, 0 );
+
+ if( !p_dec->fmt_out.video.i_visible_width ||
+ !p_dec->fmt_out.video.i_visible_height )
+ {
+ p_dec->fmt_out.video.i_visible_width =
+ p_dec->fmt_out.video.i_width;
+ p_dec->fmt_out.video.i_visible_height =
+ p_dec->fmt_out.video.i_height;
+ }
+
p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
p_sys->video = p_dec->fmt_out.video;
p_sys->p_vout = vout_Request( p_dec, p_sys->p_vout,
- p_sys->video.i_width,
- p_sys->video.i_height,
- p_sys->video.i_chroma,
- p_sys->video.i_aspect );
-
+ &p_dec->fmt_out.video );
if( p_sys->p_vout == NULL )
{
msg_Err( p_dec, "failed to create video output" );
p_dec->b_error = VLC_TRUE;
return NULL;
}
+
+ if( p_sys->video.i_rmask )
+ p_sys->p_vout->render.i_rmask = p_sys->video.i_rmask;
+ if( p_sys->video.i_gmask )
+ p_sys->p_vout->render.i_gmask = p_sys->video.i_gmask;
+ if( p_sys->video.i_bmask )
+ p_sys->p_vout->render.i_bmask = p_sys->video.i_bmask;
}
/* Get a new picture */
for( i_pic = 0; i_pic < p_dec->p_owner->p_vout->render.i_pictures;
i_pic++ )
{
- if( p_pic->i_status == READY_PICTURE && i_ready_pic++ > 0 ) break;
+ if( p_pic->i_status == READY_PICTURE )
+ {
+ if( i_ready_pic++ > 0 ) break;
+ else continue;
+ }
if( p_pic->i_status != DISPLAYED_PICTURE &&
p_pic->i_status != RESERVED_PICTURE &&
p_pic->i_status != READY_PICTURE ) break;
- if( !p_pic->i_refcount ) break;
+ if( !p_pic->i_refcount && p_pic->i_status != RESERVED_PICTURE )
+ break;
}
if( i_pic == p_dec->p_owner->p_vout->render.i_pictures )
{
{
vout_UnlinkPicture( p_dec->p_owner->p_vout, p_pic );
}
+
+static subpicture_t *spu_new_buffer( decoder_t *p_dec )
+{
+ decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
+ vout_thread_t *p_vout = NULL;
+ subpicture_t *p_subpic;
+ int i_attempts = 30;
+
+ while( i_attempts-- )
+ {
+ if( p_dec->b_die || p_dec->b_error ) break;
+
+ p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ if( p_vout ) break;
+
+ msleep( VOUT_DISPLAY_DELAY );
+ }
+
+ if( !p_vout )
+ {
+ msg_Warn( p_dec, "no vout found, dropping subpicture" );
+ return NULL;
+ }
+
+ if( p_sys->p_spu_vout != p_vout )
+ {
+ spu_Control( p_vout->p_spu, SPU_CHANNEL_REGISTER,
+ &p_sys->i_spu_channel );
+ p_sys->p_spu_vout = p_vout;
+ }
+
+ p_subpic = spu_CreateSubpicture( p_vout->p_spu );
+ if( p_subpic )
+ {
+ p_subpic->i_channel = p_sys->i_spu_channel;
+ }
+
+ vlc_object_release( p_vout );
+
+ return p_subpic;
+}
+
+static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic )
+{
+ decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
+ vout_thread_t *p_vout = NULL;
+
+ p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ if( !p_vout || p_sys->p_spu_vout != p_vout )
+ {
+ if( p_vout )
+ vlc_object_release( p_vout );
+ msg_Warn( p_dec, "no vout found, leaking subpicture" );
+ return;
+ }
+
+ spu_DestroySubpicture( p_vout->p_spu, p_subpic );
+
+ vlc_object_release( p_vout );
+}
+
projects / vlc / blobdiff