/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <assert.h>
+
+#include <vlc_common.h>
#include <vlc_block.h>
#include <vlc_vout.h>
#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 */
struct decoder_owner_sys_t
{
- vlc_bool_t b_own_thread;
+ bool b_own_thread;
int64_t i_preroll_end;
vout_thread_t *p_spu_vout;
int i_spu_channel;
+ int64_t i_spu_order;
sout_instance_t *p_sout;
sout_packetizer_input_t *p_sout_input;
/* fifo */
block_fifo_t *p_fifo;
+
+ /* CC */
+ bool b_cc_supported;
+ vlc_mutex_t lock_cc;
+ bool pb_cc_present[4];
+ decoder_t *pp_cc[4];
};
+/* */
+static void DecoderUnsupportedCodec( decoder_t *p_dec, vlc_fourcc_t codec )
+{
+ msg_Err( p_dec, "no suitable decoder module for fourcc `%4.4s'.\n"
+ "VLC probably does not support this sound or video format.",
+ (char*)&codec );
+ intf_UserFatal( p_dec, false, _("No suitable decoder module"),
+ _("VLC does not support the audio or video format \"%4.4s\". "
+ "Unfortunately there is no way for you to fix this."), (char*)&codec );
+}
+
+/* decoder_GetInputAttachment:
+ */
+input_attachment_t *decoder_GetInputAttachment( decoder_t *p_dec,
+ const char *psz_name )
+{
+ input_attachment_t *p_attachment;
+ if( input_Control( p_dec->p_owner->p_input, INPUT_GET_ATTACHMENT, &p_attachment, psz_name ) )
+ return NULL;
+ return p_attachment;
+}
+/* decoder_GetInputAttachments:
+ */
+int decoder_GetInputAttachments( decoder_t *p_dec,
+ input_attachment_t ***ppp_attachment,
+ int *pi_attachment )
+{
+ return input_Control( p_dec->p_owner->p_input, INPUT_GET_ATTACHMENTS,
+ ppp_attachment, pi_attachment );
+}
+/* decoder_GetDisplayDate:
+ */
+mtime_t decoder_GetDisplayDate( decoder_t *p_dec, mtime_t i_ts )
+{
+ VLC_UNUSED(p_dec);
+ return i_ts;
+}
/**
* Spawns a new decoder thread
* \return the spawned decoder object
*/
decoder_t *input_DecoderNew( input_thread_t *p_input,
- es_format_t *fmt, vlc_bool_t b_force_decoder )
+ es_format_t *fmt, sout_instance_t *p_sout )
{
decoder_t *p_dec = NULL;
vlc_value_t val;
+#ifndef ENABLE_SOUT
+ (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" );
- intf_UserFatal( p_input, VLC_FALSE, _("Streaming / Transcoding failed"),
+ intf_UserFatal( p_input, false, _("Streaming / Transcoding failed"),
_("VLC could not open the packetizer module.") );
return NULL;
}
}
else
+#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" );
- intf_UserFatal( p_input, VLC_FALSE, _("Streaming / Transcoding failed"),
+ intf_UserFatal( p_input, false, _("Streaming / Transcoding failed"),
_("VLC could not open the decoder module.") );
return NULL;
}
if( !p_dec->p_module )
{
- msg_Err( p_dec, "no suitable decoder module for fourcc `%4.4s'.\n"
- "VLC probably does not support this sound or video format.",
- (char*)&p_dec->fmt_in.i_codec );
- intf_UserFatal( p_dec, VLC_FALSE, _("No suitable decoder module "
- "for format"), _("VLC probably does not support the \"%4.4s\" "
- "audio or video format. Unfortunately there is no way for you "
- "to fix this."), (char*)&p_dec->fmt_in.i_codec );
+ DecoderUnsupportedCodec( p_dec, fmt->i_codec );
DeleteDecoder( p_dec );
- vlc_object_destroy( p_dec );
+ vlc_object_release( p_dec );
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 = VLC_FALSE;
+ p_dec->p_owner->b_own_thread = false;
}
else
{
/* Spawn the decoder thread */
if( vlc_thread_create( p_dec, "decoder", DecoderThread,
- i_priority, VLC_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_destroy( 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 );
+ }
+
+ /* */
+ if( p_dec->p_owner->b_cc_supported )
+ {
+ int i;
+ for( i = 0; i < 4; i++ )
+ input_DecoderSetCcState( p_dec, false, i );
}
/* Delete decoder configuration */
DeleteDecoder( p_dec );
/* Delete the decoder */
- vlc_object_destroy( p_dec );
+ vlc_object_release( p_dec );
}
/**
{
/* FIXME !!!!! */
while( !p_dec->b_die && !p_dec->b_error &&
- p_dec->p_owner->p_fifo->i_depth > 10 )
+ block_FifoCount( p_dec->p_owner->p_fifo ) > 10 )
{
msleep( 1000 );
}
}
- else if( p_dec->p_owner->p_fifo->i_size > 50000000 /* 50 MB */ )
+ else if( block_FifoSize( p_dec->p_owner->p_fifo ) > 50000000 /* 50 MB */ )
{
/* FIXME: ideally we would check the time amount of data
* in the fifo instead of its size. */
}
}
-void input_DecoderDiscontinuity( decoder_t * p_dec, vlc_bool_t b_flush )
+void input_DecoderDiscontinuity( decoder_t * p_dec, bool b_flush )
{
block_t *p_null;
/* 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;
input_DecoderDecode( p_dec, p_null );
}
-vlc_bool_t input_DecoderEmpty( decoder_t * p_dec )
+bool input_DecoderEmpty( decoder_t * p_dec )
+{
+ if( p_dec->p_owner->b_own_thread
+ && block_FifoCount( p_dec->p_owner->p_fifo ) > 0 )
+ {
+ return false;
+ }
+ return true;
+}
+
+void input_DecoderIsCcPresent( decoder_t *p_dec, bool pb_present[4] )
+{
+ int i;
+
+ vlc_mutex_lock( &p_dec->p_owner->lock_cc );
+ for( i = 0; i < 4; i++ )
+ pb_present[i] = p_dec->p_owner->pb_cc_present[i];
+ vlc_mutex_unlock( &p_dec->p_owner->lock_cc );
+}
+int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel )
{
- if( p_dec->p_owner->b_own_thread && p_dec->p_owner->p_fifo->i_depth > 0 )
+ decoder_owner_sys_t *p_owner = p_dec->p_owner;
+
+ //msg_Warn( p_dec, "input_DecoderSetCcState: %d @%d", b_decode, i_channel );
+
+ if( i_channel < 0 || i_channel >= 4 || !p_owner->pb_cc_present[i_channel] )
+ return VLC_EGENERIC;
+
+ if( b_decode )
+ {
+ static const vlc_fourcc_t fcc[4] = {
+ VLC_FOURCC('c', 'c', '1', ' '),
+ VLC_FOURCC('c', 'c', '2', ' '),
+ VLC_FOURCC('c', 'c', '3', ' '),
+ VLC_FOURCC('c', 'c', '4', ' '),
+ };
+ decoder_t *p_cc;
+ 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_dec->p_owner->p_sout );
+ if( !p_cc )
+ {
+ msg_Err( p_dec, "could not create decoder" );
+ intf_UserFatal( p_dec, false, _("Streaming / Transcoding failed"),
+ _("VLC could not open the decoder module.") );
+ return VLC_EGENERIC;
+ }
+ else if( !p_cc->p_module )
+ {
+ DecoderUnsupportedCodec( p_dec, fcc[i_channel] );
+ DeleteDecoder( p_cc );
+ vlc_object_release( p_cc );
+ return VLC_EGENERIC;
+ }
+
+ vlc_mutex_lock( &p_owner->lock_cc );
+ p_dec->p_owner->pp_cc[i_channel] = p_cc;
+ vlc_mutex_unlock( &p_owner->lock_cc );
+ }
+ else
{
- return VLC_FALSE;
+ decoder_t *p_cc;
+
+ vlc_mutex_lock( &p_owner->lock_cc );
+ p_cc = p_dec->p_owner->pp_cc[i_channel];
+ p_dec->p_owner->pp_cc[i_channel] = NULL;
+ vlc_mutex_unlock( &p_dec->p_owner->lock_cc );
+
+ if( p_cc )
+ {
+ vlc_object_kill( p_cc );
+ module_unneed( p_cc, p_cc->p_module );
+ DeleteDecoder( p_cc );
+ vlc_object_release( p_cc );
+ }
}
- return VLC_TRUE;
+ return VLC_SUCCESS;
+}
+int input_DecoderGetCcState( decoder_t *p_dec, bool *pb_decode, int i_channel )
+{
+ decoder_owner_sys_t *p_owner = p_dec->p_owner;
+
+ *pb_decode = false;
+ if( i_channel < 0 || i_channel >= 4 || !p_owner->pb_cc_present[i_channel] )
+ return VLC_EGENERIC;
+
+ vlc_mutex_lock( &p_owner->lock_cc );
+ *pb_decode = p_dec->p_owner->pp_cc[i_channel] != NULL;
+ vlc_mutex_unlock( &p_dec->p_owner->lock_cc );
+ return VLC_EGENERIC;
}
/**
* \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;
+ int i;
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_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 */
+ /* Initialize the decoder fifo */
p_dec->p_module = NULL;
memset( &null_es_format, 0, sizeof(es_format_t) );
es_format_Copy( &p_dec->fmt_out, &null_es_format );
/* Allocate our private structure for the decoder */
- p_dec->p_owner = malloc( sizeof( decoder_owner_sys_t ) );
+ 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 = VLC_TRUE;
+ p_dec->p_owner->b_own_thread = 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_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->i_spu_order = 0;
+ 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( p_dec ) ) == NULL )
+ 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 )
{
es_format_Clean( &p_dec->p_owner->p_packetizer->fmt_in );
vlc_object_detach( p_dec->p_owner->p_packetizer );
- vlc_object_destroy( p_dec->p_owner->p_packetizer );
+ vlc_object_release( p_dec->p_owner->p_packetizer );
+ }
+ }
+ }
+
+ /* Copy ourself the input replay gain */
+ if( fmt->i_cat == AUDIO_ES )
+ {
+ for( i = 0; i < AUDIO_REPLAY_GAIN_MAX; i++ )
+ {
+ if( !p_dec->fmt_out.audio_replay_gain.pb_peak[i] )
+ {
+ p_dec->fmt_out.audio_replay_gain.pb_peak[i] = fmt->audio_replay_gain.pb_peak[i];
+ p_dec->fmt_out.audio_replay_gain.pf_peak[i] = fmt->audio_replay_gain.pf_peak[i];
+ }
+ if( !p_dec->fmt_out.audio_replay_gain.pb_gain[i] )
+ {
+ p_dec->fmt_out.audio_replay_gain.pb_gain[i] = fmt->audio_replay_gain.pb_gain[i];
+ p_dec->fmt_out.audio_replay_gain.pf_gain[i] = fmt->audio_replay_gain.pf_gain[i];
}
}
}
+ /* */
+ p_owner->b_cc_supported = false;
+ if( i_object_type == VLC_OBJECT_DECODER )
+ {
+ if( p_owner->p_packetizer && p_owner->p_packetizer->pf_get_cc )
+ p_owner->b_cc_supported = true;
+ if( p_dec->pf_get_cc )
+ p_owner->b_cc_supported = true;
+ }
+ vlc_mutex_init( &p_owner->lock_cc );
+ for( i = 0; i < 4; i++ )
+ {
+ p_owner->pb_cc_present[i] = false;
+ p_owner->pp_cc[i] = NULL;
+ }
return p_dec;
}
* 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;
- 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 );
+ aout_DecPlay( p_aout, p_aout_input, p_aout_buf, i_rate );
+ }
+}
+static void DecoderGetCc( decoder_t *p_dec, decoder_t *p_dec_cc )
+{
+ block_t *p_cc;
+ bool pb_present[4];
+ int i;
+ int i_cc_decoder;
+
+ assert( p_dec_cc->pf_get_cc != NULL );
+
+ /* Do not try retreiving CC if not wanted (sout) or cannot be retreived */
+ if( !p_dec->p_owner->b_cc_supported )
+ return;
+
+ p_cc = p_dec_cc->pf_get_cc( p_dec_cc, pb_present );
+ if( !p_cc )
+ return;
+
+ vlc_mutex_lock( &p_dec->p_owner->lock_cc );
+ for( i = 0, i_cc_decoder = 0; i < 4; i++ )
+ {
+ p_dec->p_owner->pb_cc_present[i] |= pb_present[i];
+ if( p_dec->p_owner->pp_cc[i] )
+ i_cc_decoder++;
}
+
+ for( i = 0; i < 4; i++ )
+ {
+ if( !p_dec->p_owner->pp_cc[i] )
+ continue;
+
+ if( i_cc_decoder > 1 )
+ DecoderDecode( p_dec->p_owner->pp_cc[i], block_Duplicate( p_cc ) );
+ else
+ DecoderDecode( p_dec->p_owner->pp_cc[i], p_cc );
+ i_cc_decoder--;
+ }
+ vlc_mutex_unlock( &p_dec->p_owner->lock_cc );
}
static void VoutDisplayedPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
else
{
p_pic->i_status = DESTROYED_PICTURE;
+ picture_CleanupQuant( p_pic );
p_vout->i_heap_size--;
}
{
picture_t *p_pic = p_vout->render.pp_picture[i];
- if( p_pic->i_status != READY_PICTURE )
+ if( p_pic->i_status == READY_PICTURE ||
+ p_pic->i_status == DISPLAYED_PICTURE )
{
/* We cannot change picture status if it is in READY_PICTURE state,
* Just make sure they won't be displayed */
}
vlc_mutex_unlock( &p_vout->picture_lock );
}
+
+static void DecoderOptimizePtsDelay( decoder_t *p_dec )
+{
+ 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.b_auto_adjust )
+ return;
+
+ for( i = 0; i < I_RENDERPICTURES; i++ )
+ {
+ picture_t *p_pic = PP_RENDERPICTURE[i];
+
+ if( p_pic->i_status != READY_PICTURE )
+ continue;
+
+ 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( !p_young || !p_old )
+ return;
+
+ /* Try to find if we can reduce the pts
+ * This first draft is way to simple, and we can't say if the
+ * algo will converge. It's also full of constants.
+ * But this simple algo allows to reduce the latency
+ * to the minimum.
+ * The whole point of this, is to bypass the pts_delay set
+ * by the access but also the delay arbitraly set by
+ * the remote server.
+ * Actually the remote server's muxer may set up a
+ * 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. */
+ 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 )
+ {
+ 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.b_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( i_buffer_length > 100000 )
+ {
+ if( p_priv->pts_adjust.i_num_faulty > 25 )
+ {
+ i_pts_slide = -i_buffer_length/2;
+ p_priv->pts_adjust.i_num_faulty = 0;
+ }
+ if( p_priv->pts_adjust.b_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( i_pts_slide != 0 )
+ {
+ const mtime_t i_pts_delay_org = p_input->i_pts_delay;
+
+ 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;
+ 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)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 += 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;
}
- 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->p_packetizer || !p_dec->p_owner->p_packetizer->pf_get_cc ) && p_dec->pf_get_cc )
+ DecoderGetCc( p_dec, p_dec );
+
+ vout_DatePicture( p_vout, p_pic, p_pic->date );
+
+ DecoderOptimizePtsDelay( p_dec );
+
+ vout_DisplayPicture( p_vout, p_pic );
}
}
*/
static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
{
+ decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
const int i_rate = p_block ? p_block->i_rate : INPUT_RATE_DEFAULT;
if( p_block && p_block->i_buffer <= 0 )
return VLC_SUCCESS;
}
+#ifdef ENABLE_SOUT
if( p_dec->i_object_type == VLC_OBJECT_PACKETIZER )
{
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 )
{
{
msg_Err( p_dec, "cannot create packetizer output (%4.4s)",
(char *)&p_dec->p_owner->sout.i_codec );
- p_dec->b_error = VLC_TRUE;
+ p_dec->b_error = true;
while( p_sout_block )
{
p_sout_block = p_next;
}
- /* For now it's enough, as only sout inpact on this flag */
+ /* For now it's enough, as only sout impact on this flag */
if( p_dec->p_owner->p_sout->i_out_pace_nocontrol > 0 &&
p_dec->p_owner->p_input->p->b_out_pace_control )
{
msg_Dbg( p_dec, "switching to sync mode" );
- p_dec->p_owner->p_input->p->b_out_pace_control = VLC_FALSE;
+ p_dec->p_owner->p_input->p->b_out_pace_control = false;
}
else if( p_dec->p_owner->p_sout->i_out_pace_nocontrol <= 0 &&
!p_dec->p_owner->p_input->p->b_out_pace_control )
{
msg_Dbg( p_dec, "switching to async mode" );
- p_dec->p_owner->p_input->p->b_out_pace_control = VLC_TRUE;
+ p_dec->p_owner->p_input->p->b_out_pace_control = true;
}
}
}
- else if( p_dec->fmt_in.i_cat == AUDIO_ES )
+ else
+#endif
+ if( p_dec->fmt_in.i_cat == AUDIO_ES )
{
- DecoderUpdatePreroll( &p_dec->p_owner->i_preroll_end, p_block );
+ if( p_block )
+ DecoderUpdatePreroll( &p_dec->p_owner->i_preroll_end, p_block );
if( p_dec->p_owner->p_packetizer )
{
decoder_t *p_packetizer = p_dec->p_owner->p_packetizer;
while( (p_packetized_block =
- p_packetizer->pf_packetize( p_packetizer, &p_block )) )
+ p_packetizer->pf_packetize( p_packetizer, p_block ? &p_block : NULL )) )
{
if( p_packetizer->fmt_out.i_extra && !p_dec->fmt_in.i_extra )
{
}
}
}
- else
+ else if( p_block )
{
DecoderDecodeAudio( p_dec, p_block );
}
}
else if( p_dec->fmt_in.i_cat == VIDEO_ES )
{
- DecoderUpdatePreroll( &p_dec->p_owner->i_preroll_end, p_block );
+ if( p_block )
+ DecoderUpdatePreroll( &p_dec->p_owner->i_preroll_end, p_block );
if( p_dec->p_owner->p_packetizer )
{
decoder_t *p_packetizer = p_dec->p_owner->p_packetizer;
while( (p_packetized_block =
- p_packetizer->pf_packetize( p_packetizer, &p_block )) )
+ p_packetizer->pf_packetize( p_packetizer, p_block ? &p_block : NULL )) )
{
if( p_packetizer->fmt_out.i_extra && !p_dec->fmt_in.i_extra )
{
es_format_Clean( &p_dec->fmt_in );
es_format_Copy( &p_dec->fmt_in, &p_packetizer->fmt_out );
}
+ if( p_packetizer->pf_get_cc )
+ DecoderGetCc( p_dec, p_packetizer );
while( p_packetized_block )
{
}
}
}
- else
+ else if( p_block )
{
DecoderDecodeVideo( p_dec, p_block );
}
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;
+ }
- DecoderUpdatePreroll( &p_dec->p_owner->i_preroll_end, p_block );
+ 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 ) ) )
+ while( (p_spu = p_dec->pf_decode_sub( p_dec, p_block ? &p_block : NULL ) ) )
{
vlc_mutex_lock( &p_input->p->counters.counters_lock );
stats_UpdateInteger( p_dec, p_input->p->counters.p_decoded_sub, 1, NULL );
vlc_mutex_unlock( &p_input->p->counters.counters_lock );
- 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 ) )
+ p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ if( p_vout && p_sys->p_spu_vout == p_vout )
{
- spu_DestroySubpicture( p_dec->p_owner->p_vout->p_spu, p_spu );
- continue;
+ /* 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 ) )
+ {
+ subpicture_Delete( p_spu );
+ }
+ else
+ spu_DisplaySubpicture( p_vout->p_spu, p_spu );
}
-
- p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
- if( p_vout )
+ else
{
- spu_DisplaySubpicture( p_vout->p_spu, p_spu );
- vlc_object_release( p_vout );
+ msg_Warn( p_dec, "no vout found, leaking subpicture" );
}
+ if( p_vout )
+ vlc_object_release( p_vout );
}
}
else
*/
static void DeleteDecoder( decoder_t * p_dec )
{
- msg_Dbg( p_dec, "killing decoder fourcc `%4.4s', %d PES in FIFO",
+ msg_Dbg( p_dec, "killing decoder fourcc `%4.4s', %u PES in FIFO",
(char*)&p_dec->fmt_in.i_codec,
- p_dec->p_owner->p_fifo->i_depth );
+ (unsigned)block_FifoCount( p_dec->p_owner->p_fifo ) );
/* Free all packets still in the decoder fifo. */
block_FifoEmpty( p_dec->p_owner->p_fifo );
/* Cleanup */
if( p_dec->p_owner->p_aout_input )
aout_DecDelete( p_dec->p_owner->p_aout, p_dec->p_owner->p_aout_input );
-
+ if( p_dec->p_owner->p_aout )
+ {
+ vlc_object_release( p_dec->p_owner->p_aout );
+ p_dec->p_owner->p_aout = NULL;
+ }
if( p_dec->p_owner->p_vout )
{
int i_pic;
#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_sout_input )
{
sout_InputDelete( p_dec->p_owner->p_sout_input );
es_format_Clean( &p_dec->p_owner->sout );
}
+#endif
if( p_dec->fmt_in.i_cat == SPU_ES )
{
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 );
vlc_object_detach( p_dec->p_owner->p_packetizer );
- vlc_object_destroy( p_dec->p_owner->p_packetizer );
+ vlc_object_release( p_dec->p_owner->p_packetizer );
}
+ vlc_mutex_destroy( &p_dec->p_owner->lock_cc );
+
vlc_object_detach( p_dec );
free( p_dec->p_owner );
}
p_sys->p_aout_input =
- aout_DecNew( p_dec, &p_sys->p_aout, &format );
+ aout_DecNew( p_dec, &p_sys->p_aout, &format, &p_dec->fmt_out.audio_replay_gain );
if( p_sys->p_aout_input == NULL )
{
msg_Err( p_dec, "failed to create audio output" );
- p_dec->b_error = VLC_TRUE;
+ p_dec->b_error = true;
return NULL;
}
p_dec->fmt_out.audio.i_bytes_per_frame =
p_sys->audio.i_bytes_per_frame;
}
- p_buffer = aout_DecNewBuffer( p_sys->p_aout, p_sys->p_aout_input,
- i_samples );
+ p_buffer = aout_DecNewBuffer( p_sys->p_aout_input, i_samples );
return p_buffer;
}
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_dec->b_error = VLC_TRUE;
+ p_dec->b_error = true;
return NULL;
}
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 */
{
spu_Control( p_vout->p_spu, SPU_CHANNEL_REGISTER,
&p_sys->i_spu_channel );
+ p_sys->i_spu_order = 0;
p_sys->p_spu_vout = p_vout;
}
- p_subpic = spu_CreateSubpicture( p_vout->p_spu );
+ p_subpic = subpicture_New();
if( p_subpic )
{
p_subpic->i_channel = p_sys->i_spu_channel;
+ p_subpic->i_order = p_sys->i_spu_order++;
+ p_subpic->b_subtitle = true;
}
vlc_object_release( p_vout );
return;
}
- spu_DestroySubpicture( p_vout->p_spu, p_subpic );
+ subpicture_Delete( p_subpic );
vlc_object_release( p_vout );
}
projects / vlc / blobdiff