#include "stream_output/stream_output.h"
#include "input_internal.h"
-static decoder_t * CreateDecoder( input_thread_t *, es_format_t *, int );
+static decoder_t * CreateDecoder( input_thread_t *, es_format_t *, int, sout_instance_t *p_sout );
static void DeleteDecoder( decoder_t * );
-static int DecoderThread( decoder_t * );
+static void* DecoderThread( vlc_object_t * );
static int DecoderDecode( decoder_t * p_dec, block_t *p_block );
/* Buffers allocation callbacks for the decoders */
* \return the spawned decoder object
*/
decoder_t *input_DecoderNew( input_thread_t *p_input,
- es_format_t *fmt, bool b_force_decoder )
+ es_format_t *fmt, sout_instance_t *p_sout )
{
decoder_t *p_dec = NULL;
vlc_value_t val;
(void)b_force_decoder;
#else
/* If we are in sout mode, search for packetizer module */
- if( p_input->p->p_sout && !b_force_decoder )
+ if( p_sout )
{
/* Create the decoder configuration structure */
- p_dec = CreateDecoder( p_input, fmt, VLC_OBJECT_PACKETIZER );
+ p_dec = CreateDecoder( p_input, fmt, VLC_OBJECT_PACKETIZER, p_sout );
if( p_dec == NULL )
{
msg_Err( p_input, "could not create packetizer" );
#endif
{
/* Create the decoder configuration structure */
- p_dec = CreateDecoder( p_input, fmt, VLC_OBJECT_DECODER );
+ p_dec = CreateDecoder( p_input, fmt, VLC_OBJECT_DECODER, p_sout );
if( p_dec == NULL )
{
msg_Err( p_input, "could not create decoder" );
return NULL;
}
- if( p_input->p->p_sout && p_input->p->input.b_can_pace_control &&
- !b_force_decoder )
+ if( p_sout && p_sout == p_input->p->p_sout && p_input->p->input.b_can_pace_control )
{
msg_Dbg( p_input, "stream out mode -> no decoder thread" );
p_dec->p_owner->b_own_thread = false;
i_priority, false ) )
{
msg_Err( p_dec, "cannot spawn decoder thread" );
- module_Unneed( p_dec, p_dec->p_module );
+ module_unneed( p_dec, p_dec->p_module );
DeleteDecoder( p_dec );
vlc_object_release( p_dec );
return NULL;
vlc_thread_join( p_dec );
- /* Don't module_Unneed() here because of the dll loader that wants
+ /* Don't module_unneed() here because of the dll loader that wants
* close() in the same thread than open()/decode() */
}
else
/* Flush */
input_DecoderDecode( p_dec, NULL );
- module_Unneed( p_dec, p_dec->p_module );
+ module_unneed( p_dec, p_dec->p_module );
}
/* */
/* Send a special block */
p_null = block_New( p_dec, 128 );
p_null->i_flags |= BLOCK_FLAG_DISCONTINUITY;
+ if( b_flush && p_dec->fmt_in.i_cat == SPU_ES )
+ p_null->i_flags |= BLOCK_FLAG_CORE_FLUSH;
/* FIXME check for p_packetizer or b_packitized from es_format_t of input ? */
if( p_dec->p_owner->p_packetizer && b_flush )
p_null->i_flags |= BLOCK_FLAG_CORRUPTED;
es_format_t fmt;
es_format_Init( &fmt, SPU_ES, fcc[i_channel] );
- p_cc = CreateDecoder( p_owner->p_input, &fmt, VLC_OBJECT_DECODER );
+ p_cc = CreateDecoder( p_owner->p_input, &fmt, VLC_OBJECT_DECODER, p_dec->p_owner->p_sout );
if( !p_cc )
{
msg_Err( p_dec, "could not create decoder" );
if( p_cc )
{
vlc_object_kill( p_cc );
- module_Unneed( p_cc, p_cc->p_module );
+ module_unneed( p_cc, p_cc->p_module );
DeleteDecoder( p_cc );
vlc_object_release( p_cc );
}
* \return the decoder object
*/
static decoder_t * CreateDecoder( input_thread_t *p_input,
- es_format_t *fmt, int i_object_type )
+ es_format_t *fmt, int i_object_type, sout_instance_t *p_sout )
{
decoder_t *p_dec;
decoder_owner_sys_t *p_owner;
p_dec = vlc_object_create( p_input, i_object_type );
if( p_dec == NULL )
- {
- msg_Err( p_input, "out of memory" );
return NULL;
- }
- p_dec->pf_decode_audio = 0;
- p_dec->pf_decode_video = 0;
- p_dec->pf_decode_sub = 0;
- p_dec->pf_get_cc = 0;
- p_dec->pf_packetize = 0;
+ p_dec->pf_decode_audio = NULL;
+ p_dec->pf_decode_video = NULL;
+ p_dec->pf_decode_sub = NULL;
+ p_dec->pf_get_cc = NULL;
+ p_dec->pf_packetize = NULL;
/* Initialize the decoder fifo */
p_dec->p_module = NULL;
p_dec->p_owner = p_owner = malloc( sizeof( decoder_owner_sys_t ) );
if( p_dec->p_owner == NULL )
{
- msg_Err( p_dec, "out of memory" );
+ vlc_object_release( p_dec );
return NULL;
}
p_dec->p_owner->b_own_thread = true;
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->p_sout;
+ p_dec->p_owner->p_sout = 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() ) == NULL )
{
- msg_Err( p_dec, "out of memory" );
+ free( p_dec->p_owner );
+ vlc_object_release( p_dec );
return NULL;
}
/* Find a suitable decoder/packetizer module */
if( i_object_type == VLC_OBJECT_DECODER )
- p_dec->p_module = module_Need( p_dec, "decoder", "$codec", 0 );
+ p_dec->p_module = module_need( p_dec, "decoder", "$codec", 0 );
else
- p_dec->p_module = module_Need( p_dec, "packetizer", "$packetizer", 0 );
+ p_dec->p_module = module_need( p_dec, "packetizer", "$packetizer", 0 );
/* Check if decoder requires already packetized data */
if( i_object_type == VLC_OBJECT_DECODER &&
vlc_object_attach( p_dec->p_owner->p_packetizer, p_input );
p_dec->p_owner->p_packetizer->p_module =
- module_Need( p_dec->p_owner->p_packetizer,
+ module_need( p_dec->p_owner->p_packetizer,
"packetizer", "$packetizer", 0 );
if( !p_dec->p_owner->p_packetizer->p_module )
* The decoding main loop
*
* \param p_dec the decoder
- * \return 0
*/
-static int DecoderThread( decoder_t * p_dec )
+static void* DecoderThread( vlc_object_t *p_this )
{
+ decoder_t * p_dec = (decoder_t *)p_this;
block_t *p_block;
+ int canc = vlc_savecancel ();
/* The decoder's main loop */
while( !p_dec->b_die && !p_dec->b_error )
/* We do it here because of the dll loader that wants close() in the
* same thread than open()/decode() */
- module_Unneed( p_dec, p_dec->p_module );
-
- return 0;
+ module_unneed( p_dec, p_dec->p_module );
+ vlc_restorecancel (canc);
+ return NULL;
}
static inline void DecoderUpdatePreroll( int64_t *pi_preroll, const block_t *p )
}
static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
{
- input_thread_t *p_input = p_dec->p_owner->p_input;
- const int i_rate = p_block->i_rate;
- aout_buffer_t *p_aout_buf;
+ input_thread_t *p_input = p_dec->p_owner->p_input;
+ const int i_rate = p_block->i_rate;
+ aout_buffer_t *p_aout_buf;
while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
{
+ aout_instance_t *p_aout = p_dec->p_owner->p_aout;
+ aout_input_t *p_aout_input = p_dec->p_owner->p_aout_input;
+
+ if( p_dec->b_die )
+ {
+ /* It prevent freezing VLC in case of broken decoder */
+ aout_DecDeleteBuffer( p_aout, p_aout_input, p_aout_buf );
+ if( p_block )
+ block_Release( p_block );
+ break;
+ }
vlc_mutex_lock( &p_input->p->counters.counters_lock );
stats_UpdateInteger( p_dec, p_input->p->counters.p_decoded_audio, 1, NULL );
vlc_mutex_unlock( &p_input->p->counters.counters_lock );
if( 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 );
+ aout_DecDeleteBuffer( p_aout, p_aout_input, p_aout_buf );
continue;
}
msg_Dbg( p_dec, "End of audio preroll" );
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, i_rate );
+ aout_DecPlay( p_aout, p_aout_input, p_aout_buf, i_rate );
}
}
static void DecoderGetCc( decoder_t *p_dec, decoder_t *p_dec_cc )
else
{
p_pic->i_status = DESTROYED_PICTURE;
+ picture_CleanupQuant( p_pic );
p_vout->i_heap_size--;
}
vlc_mutex_unlock( &p_vout->picture_lock );
}
-
-static void optimize_video_pts( decoder_t *p_dec )
+static void DecoderOptimizePtsDelay( decoder_t *p_dec )
{
- picture_t * oldest_pict = NULL;
- picture_t * youngest_pict = NULL;
- int i;
+ input_thread_t *p_input = p_dec->p_owner->p_input;
+ vout_thread_t *p_vout = p_dec->p_owner->p_vout;
+ input_thread_private_t *p_priv = p_input->p;
- input_thread_t * p_input = p_dec->p_owner->p_input;
- vout_thread_t * p_vout = p_dec->p_owner->p_vout;
- input_thread_private_t * p_priv = p_input->p;
+ picture_t *p_old = NULL;
+ picture_t *p_young = NULL;
+ int i;
/* Enable with --auto-adjust-pts-delay */
- if( !p_priv->pts_adjust.auto_adjust ) return;
+ if( !p_priv->pts_adjust.b_auto_adjust )
+ return;
for( i = 0; i < I_RENDERPICTURES; i++ )
{
- picture_t * pic = PP_RENDERPICTURE[i];
- if( pic->i_status != READY_PICTURE )
+ picture_t *p_pic = PP_RENDERPICTURE[i];
+
+ if( p_pic->i_status != READY_PICTURE )
continue;
- if( !oldest_pict || pic->date < oldest_pict->date )
- oldest_pict = pic;
- if( !youngest_pict || pic->date > youngest_pict->date )
- youngest_pict = pic;
+ if( !p_old || p_pic->date < p_old->date )
+ p_old = p_pic;
+ if( !p_young || p_pic->date > p_young->date )
+ p_young = p_pic;
}
- if( !youngest_pict || !oldest_pict )
+ if( !p_young || !p_old )
return;
/* Try to find if we can reduce the pts
* pts<->dts delay in the muxed stream. That is
* why we may end up in having a negative pts_delay,
* to compensate that artificial delay. */
- mtime_t buffer_size = youngest_pict->date - oldest_pict->date;
- int64_t pts_slide = 0;
- if( buffer_size < 10000 )
+ const mtime_t i_buffer_length = p_young->date - p_old->date;
+ int64_t i_pts_slide = 0;
+ if( i_buffer_length < 10000 )
{
if( p_priv->pts_adjust.i_num_faulty > 10 )
{
- pts_slide = __MAX(p_input->i_pts_delay *3 / 2, 10000);
+ i_pts_slide = __MAX(p_input->i_pts_delay *3 / 2, 10000);
p_priv->pts_adjust.i_num_faulty = 0;
}
- if( p_priv->pts_adjust.to_high )
+ if( p_priv->pts_adjust.b_to_high )
{
- p_priv->pts_adjust.to_high = !p_priv->pts_adjust.to_high;
+ p_priv->pts_adjust.b_to_high = !p_priv->pts_adjust.b_to_high;
p_priv->pts_adjust.i_num_faulty = 0;
}
p_priv->pts_adjust.i_num_faulty++;
}
- else if( buffer_size > 100000 )
+ else if( i_buffer_length > 100000 )
{
if( p_priv->pts_adjust.i_num_faulty > 25 )
{
- pts_slide = -buffer_size/2;
+ i_pts_slide = -i_buffer_length/2;
p_priv->pts_adjust.i_num_faulty = 0;
}
- if( p_priv->pts_adjust.to_high )
+ if( p_priv->pts_adjust.b_to_high )
{
- p_priv->pts_adjust.to_high = !p_priv->pts_adjust.to_high;
+ p_priv->pts_adjust.b_to_high = !p_priv->pts_adjust.b_to_high;
p_priv->pts_adjust.i_num_faulty = 0;
}
p_priv->pts_adjust.i_num_faulty++;
}
- if( pts_slide )
+ if( i_pts_slide != 0 )
{
- mtime_t origi_delay = p_input->i_pts_delay;
+ const mtime_t i_pts_delay_org = p_input->i_pts_delay;
- p_input->i_pts_delay += pts_slide;
+ p_input->i_pts_delay += i_pts_slide;
/* Don't play with the pts delay for more than -2<->3sec */
if( p_input->i_pts_delay < -2000000 )
p_input->i_pts_delay = -2000000;
else if( p_input->i_pts_delay > 3000000 )
p_input->i_pts_delay = 3000000;
- pts_slide = p_input->i_pts_delay - origi_delay;
+ i_pts_slide = p_input->i_pts_delay - i_pts_delay_org;
msg_Dbg( p_input, "Sliding the pts by %dms pts delay at %dms picture buffer was %dms",
- (int)pts_slide/1000, (int)p_input->i_pts_delay/1000, (int)buffer_size/1000);
+ (int)i_pts_slide/1000, (int)p_input->i_pts_delay/1000, (int)i_buffer_length/1000);
vlc_mutex_lock( &p_vout->picture_lock );
/* Slide all the picture */
for( i = 0; i < I_RENDERPICTURES; i++ )
- PP_RENDERPICTURE[i]->date += pts_slide;
+ PP_RENDERPICTURE[i]->date += i_pts_slide;
/* FIXME: slide aout/spu */
vlc_mutex_unlock( &p_vout->picture_lock );
-
}
}
static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block )
{
input_thread_t *p_input = p_dec->p_owner->p_input;
- picture_t *p_pic;
+ picture_t *p_pic;
while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
{
+ vout_thread_t *p_vout = p_dec->p_owner->p_vout;
+ if( p_dec->b_die )
+ {
+ /* It prevent freezing VLC in case of broken decoder */
+ VoutDisplayedPicture( p_vout, p_pic );
+ if( p_block )
+ block_Release( p_block );
+ break;
+ }
+
vlc_mutex_lock( &p_input->p->counters.counters_lock );
stats_UpdateInteger( p_dec, p_input->p->counters.p_decoded_video, 1, NULL );
vlc_mutex_unlock( &p_input->p->counters.counters_lock );
if( p_pic->date < p_dec->p_owner->i_preroll_end )
{
- VoutDisplayedPicture( p_dec->p_owner->p_vout, p_pic );
+ VoutDisplayedPicture( p_vout, p_pic );
continue;
}
if( p_dec->p_owner->i_preroll_end > 0 )
{
msg_Dbg( p_dec, "End of video preroll" );
- if( p_dec->p_owner->p_vout )
- VoutFlushPicture( p_dec->p_owner->p_vout );
+ if( p_vout )
+ VoutFlushPicture( p_vout );
/* */
p_dec->p_owner->i_preroll_end = -1;
}
if( ( !p_dec->p_owner->p_packetizer || !p_dec->p_owner->p_packetizer->pf_get_cc ) && p_dec->pf_get_cc )
DecoderGetCc( p_dec, p_dec );
- vout_DatePicture( p_dec->p_owner->p_vout, p_pic,
- p_pic->date );
+ vout_DatePicture( p_vout, p_pic, p_pic->date );
- optimize_video_pts( p_dec );
+ DecoderOptimizePtsDelay( p_dec );
- vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
+ vout_DisplayPicture( p_vout, p_pic );
}
}
block_t *p_sout_block;
while( ( p_sout_block =
- p_dec->pf_packetize( p_dec, p_block ? &p_block : 0 ) ) )
+ p_dec->pf_packetize( p_dec, p_block ? &p_block : NULL ) ) )
{
if( !p_dec->p_owner->p_sout_input )
{
input_thread_t *p_input = p_dec->p_owner->p_input;
vout_thread_t *p_vout;
subpicture_t *p_spu;
+ bool b_flushing = p_dec->p_owner->i_preroll_end == INT64_MAX;
+ bool b_flush = false;
if( p_block )
+ {
DecoderUpdatePreroll( &p_dec->p_owner->i_preroll_end, p_block );
+ b_flush = (p_block->i_flags & BLOCK_FLAG_CORE_FLUSH) != 0;
+ }
+
+ if( !b_flushing && b_flush && p_sys->p_spu_vout )
+ {
+ p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+
+ if( p_vout && p_sys->p_spu_vout == p_vout )
+ spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR,
+ p_dec->p_owner->i_spu_channel );
+
+ if( p_vout )
+ vlc_object_release( p_vout );
+ }
while( (p_spu = p_dec->pf_decode_sub( p_dec, p_block ? &p_block : NULL ) ) )
{
/* Prerool does not work very well with subtitle */
if( 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_vout->p_spu, p_spu );
+ }
else
spu_DisplaySubpicture( p_vout->p_spu, p_spu );
}
#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 );
+ vout_Request( p_dec, p_dec->p_owner->p_vout, NULL );
+ var_SetBool( p_dec->p_owner->p_input, "intf-change-vout", true );
}
#ifdef ENABLE_SOUT
if( p_dec->p_owner->p_packetizer )
{
- module_Unneed( p_dec->p_owner->p_packetizer,
+ module_unneed( p_dec->p_owner->p_packetizer,
p_dec->p_owner->p_packetizer->p_module );
es_format_Clean( &p_dec->p_owner->p_packetizer->fmt_in );
es_format_Clean( &p_dec->p_owner->p_packetizer->fmt_out );
p_dec->p_owner->p_aout_input, p_buffer );
}
+
+int vout_CountPictureAvailable( vout_thread_t *p_vout );
+
static picture_t *vout_new_buffer( decoder_t *p_dec )
{
decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
p_sys->p_vout = vout_Request( p_dec, p_sys->p_vout,
&p_dec->fmt_out.video );
+ var_SetBool( p_sys->p_input, "intf-change-vout", true );
if( p_sys->p_vout == NULL )
{
msg_Err( p_dec, "failed to create video output" );
p_sys->p_vout->render.i_bmask = p_sys->video.i_bmask;
}
- /* Get a new picture */
- while( !(p_pic = vout_CreatePicture( p_sys->p_vout, 0, 0, 0 ) ) )
+ /* Get a new picture
+ */
+ for( p_pic = NULL; ; )
{
- int i_pic, i_ready_pic = 0;
+ int i_pic, i_ready_pic;
if( p_dec->b_die || p_dec->b_error )
- {
return NULL;
+
+ /* The video filter chain required that there is always 1 free buffer
+ * that it will use as temporary one. It will release the temporary
+ * buffer once its work is done, so this check is safe even if we don't
+ * lock around both count() and create().
+ */
+ if( vout_CountPictureAvailable( p_sys->p_vout ) >= 2 )
+ {
+ p_pic = vout_CreatePicture( p_sys->p_vout, 0, 0, 0 );
+ if( p_pic )
+ break;
}
#define p_pic p_dec->p_owner->p_vout->render.pp_picture[i_pic]
/* Check the decoder doesn't leak pictures */
- for( i_pic = 0; i_pic < p_dec->p_owner->p_vout->render.i_pictures;
- i_pic++ )
+ for( i_pic = 0, i_ready_pic = 0; i_pic < p_dec->p_owner->p_vout->render.i_pictures; i_pic++ )
{
if( p_pic->i_status == READY_PICTURE )
{
- if( i_ready_pic++ > 0 ) break;
- else continue;
- }
+ i_ready_pic++;
+ /* If we have at least 2 ready pictures, wait for the vout thread to
+ * process one */
+ if( i_ready_pic >= 2 )
+ break;
- if( p_pic->i_status != DISPLAYED_PICTURE &&
- p_pic->i_status != RESERVED_PICTURE &&
- p_pic->i_status != READY_PICTURE ) break;
+ continue;
+ }
- if( !p_pic->i_refcount && p_pic->i_status != RESERVED_PICTURE )
- break;
+ if( p_pic->i_status == DISPLAYED_PICTURE )
+ {
+ /* If at least one displayed picture is not referenced
+ * let vout free it */
+ if( p_pic->i_refcount == 0 )
+ break;
+ }
}
if( i_pic == p_dec->p_owner->p_vout->render.i_pictures )
{
+ /* Too many pictures are still referenced, there is probably a bug
+ * with the decoder */
msg_Err( p_dec, "decoder is leaking pictures, resetting the heap" );
/* Just free all the pictures */
if( p_subpic )
{
p_subpic->i_channel = p_sys->i_spu_channel;
+ p_subpic->b_subtitle = true;
}
vlc_object_release( p_vout );
projects / vlc / blobdiff