#include "../video_output/vout_control.h"
-static decoder_t *CreateDecoder( input_thread_t *, es_format_t *, int, sout_instance_t *p_sout );
+static decoder_t *CreateDecoder( input_thread_t *, es_format_t *, bool,
+ sout_instance_t *p_sout );
static void DeleteDecoder( decoder_t * );
static void *DecoderThread( vlc_object_t * );
/* Some decoders require already packetized data (ie. not truncated) */
decoder_t *p_packetizer;
+ bool b_packetizer;
/* Current format in use by the output */
video_format_t video;
* \return the spawned decoder object
*/
decoder_t *input_DecoderNew( input_thread_t *p_input,
- es_format_t *fmt, input_clock_t *p_clock, sout_instance_t *p_sout )
+ es_format_t *fmt, input_clock_t *p_clock,
+ sout_instance_t *p_sout )
{
decoder_t *p_dec = NULL;
+ const char *psz_type = p_sout ? N_("packetizer") : N_("decoder");
int i_priority;
-#ifdef ENABLE_SOUT
- /* If we are in sout mode, search for packetizer module */
- if( p_sout )
- {
- /* Create the decoder configuration structure */
- p_dec = CreateDecoder( p_input, fmt, VLC_OBJECT_PACKETIZER, p_sout );
- if( p_dec == NULL )
- {
- msg_Err( p_input, "could not create packetizer" );
- dialog_Fatal( p_input, _("Streaming / Transcoding failed"), "%s",
- _("VLC could not open the packetizer module.") );
- return NULL;
- }
- }
- else
-#endif
+ /* Create the decoder configuration structure */
+ p_dec = CreateDecoder( p_input, fmt, p_sout != NULL, p_sout );
+ if( p_dec == NULL )
{
- /* Create the decoder configuration structure */
- p_dec = CreateDecoder( p_input, fmt, VLC_OBJECT_DECODER, p_sout );
- if( p_dec == NULL )
- {
- msg_Err( p_input, "could not create decoder" );
- dialog_Fatal( p_input, _("Streaming / Transcoding failed"), "%s",
- _("VLC could not open the decoder module.") );
- return NULL;
- }
+ msg_Err( p_input, "could not create %s", psz_type );
+ dialog_Fatal( p_input, _("Streaming / Transcoding failed"),
+ _("VLC could not open the %s module."),
+ vlc_gettext( psz_type ) );
+ return NULL;
}
if( !p_dec->p_module )
if( !p_owner->b_buffering )
block_FifoPace( p_owner->p_fifo, 10, SIZE_MAX );
}
+#ifdef __arm__
else if( block_FifoSize( p_owner->p_fifo ) > 50000000 /* 50 MB */ )
+#else
+ else if( block_FifoSize( p_owner->p_fifo ) > 400000000 /* 400 MB, ie ~ 50mb/s for 60s */ )
+#endif
{
/* FIXME: ideally we would check the time amount of data
* in the FIFO instead of its size. */
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_owner->p_sout );
+ p_cc = CreateDecoder( p_owner->p_input, &fmt, false, p_owner->p_sout );
if( !p_cc )
{
msg_Err( p_dec, "could not create decoder" );
return b_changed;
}
+size_t input_DecoderGetFifoSize( decoder_t *p_dec )
+{
+ decoder_owner_sys_t *p_owner = p_dec->p_owner;
+
+ return block_FifoSize( p_owner->p_fifo );
+}
+
/*****************************************************************************
* Internal functions
*****************************************************************************/
/* */
static void DecoderUnsupportedCodec( decoder_t *p_dec, vlc_fourcc_t codec )
{
- msg_Err( p_dec, "no suitable decoder module for fourcc `%4.4s'.\n"
+ msg_Err( p_dec, "no suitable decoder module for fourcc `%4.4s'. "
"VLC probably does not support this sound or video format.",
(char*)&codec );
dialog_Fatal( p_dec, _("No suitable decoder module"),
*
* \param p_input the input thread
* \param p_es the es descriptor
- * \param i_object_type Object type as define in include/vlc_objects.h
+ * \param b_packetizer instead of a decoder
* \return the decoder object
*/
static decoder_t * CreateDecoder( input_thread_t *p_input,
- es_format_t *fmt, int i_object_type, sout_instance_t *p_sout )
+ es_format_t *fmt, bool b_packetizer,
+ sout_instance_t *p_sout )
{
decoder_t *p_dec;
decoder_owner_sys_t *p_owner;
es_format_t null_es_format;
- int i;
-
- p_dec = vlc_object_create( p_input, i_object_type );
+ p_dec = vlc_object_create( p_input, VLC_OBJECT_DECODER );
if( p_dec == NULL )
return NULL;
p_dec->p_owner->p_sout = p_sout;
p_dec->p_owner->p_sout_input = NULL;
p_dec->p_owner->p_packetizer = NULL;
+ p_dec->p_owner->b_packetizer = b_packetizer;
/* decoder fifo */
if( ( p_dec->p_owner->p_fifo = block_FifoNew() ) == NULL )
vlc_object_attach( p_dec, p_input );
/* Find a suitable decoder/packetizer module */
- if( i_object_type == VLC_OBJECT_DECODER )
+ if( !b_packetizer )
p_dec->p_module = module_need( p_dec, "decoder", "$codec", false );
else
p_dec->p_module = module_need( p_dec, "packetizer", "$packetizer", false );
/* Check if decoder requires already packetized data */
- if( i_object_type == VLC_OBJECT_DECODER &&
+ if( !b_packetizer &&
p_dec->b_need_packetized && !p_dec->fmt_in.b_packetized )
{
p_dec->p_owner->p_packetizer =
- vlc_object_create( p_input, VLC_OBJECT_PACKETIZER );
+ vlc_object_create( p_input, VLC_OBJECT_DECODER );
if( p_dec->p_owner->p_packetizer )
{
es_format_Copy( &p_dec->p_owner->p_packetizer->fmt_in,
/* Copy ourself the input replay gain */
if( fmt->i_cat == AUDIO_ES )
{
- for( i = 0; i < AUDIO_REPLAY_GAIN_MAX; i++ )
+ for( unsigned i = 0; i < AUDIO_REPLAY_GAIN_MAX; i++ )
{
if( !p_dec->fmt_out.audio_replay_gain.pb_peak[i] )
{
/* */
p_owner->cc.b_supported = false;
- if( i_object_type == VLC_OBJECT_DECODER )
+ if( !b_packetizer )
{
if( p_owner->p_packetizer && p_owner->p_packetizer->pf_get_cc )
p_owner->cc.b_supported = true;
p_owner->cc.b_supported = true;
}
- for( i = 0; i < 4; i++ )
+ for( unsigned i = 0; i < 4; i++ )
{
p_owner->cc.pb_present[i] = false;
p_owner->cc.pp_decoder[i] = NULL;
}
}
+/**
+ * If *pb_reject, it does nothing, otherwise it waits for the given
+ * deadline or a flush request (in which case it set *pi_reject to true.
+ */
+static void DecoderWaitDate( decoder_t *p_dec,
+ bool *pb_reject, mtime_t i_deadline )
+{
+ decoder_owner_sys_t *p_owner = p_dec->p_owner;
+
+ if( *pb_reject || i_deadline < 0 )
+ return;
+
+ for( ;; )
+ {
+ vlc_mutex_lock( &p_owner->lock );
+ if( p_owner->b_flushing || p_dec->b_die )
+ {
+ *pb_reject = true;
+ vlc_mutex_unlock( &p_owner->lock );
+ break;
+ }
+ int i_ret = vlc_cond_timedwait( &p_owner->wait_request, &p_owner->lock,
+ i_deadline );
+ vlc_mutex_unlock( &p_owner->lock );
+ if( i_ret )
+ break;
+ }
+}
+
static void DecoderPlayAudio( decoder_t *p_dec, aout_buffer_t *p_audio,
int *pi_played_sum, int *pi_lost_sum )
{
aout_input_t *p_aout_input = p_owner->p_aout_input;
/* */
- if( p_audio->start_date <= VLC_TS_INVALID ) // FIXME --VLC_TS_INVALID verify audio_output/*
+ if( p_audio->i_pts <= VLC_TS_INVALID ) // FIXME --VLC_TS_INVALID verify audio_output/*
{
msg_Warn( p_dec, "non-dated audio buffer received" );
*pi_lost_sum += 1;
p_owner->buffer.i_count++;
if( p_owner->buffer.i_count > DECODER_MAX_BUFFERING_COUNT ||
- p_audio->start_date - p_owner->buffer.p_audio->start_date > DECODER_MAX_BUFFERING_AUDIO_DURATION )
+ p_audio->i_pts - p_owner->buffer.p_audio->i_pts > DECODER_MAX_BUFFERING_AUDIO_DURATION )
{
p_owner->buffer.b_full = true;
vlc_cond_signal( &p_owner->wait_acknowledge );
}
/* */
- const bool b_dated = p_audio->start_date > VLC_TS_INVALID;
+ const bool b_dated = p_audio->i_pts > VLC_TS_INVALID;
int i_rate = INPUT_RATE_DEFAULT;
- DecoderFixTs( p_dec, &p_audio->start_date, &p_audio->end_date, NULL,
+ DecoderFixTs( p_dec, &p_audio->i_pts, NULL, &p_audio->i_length,
&i_rate, AOUT_MAX_ADVANCE_TIME, false );
vlc_mutex_unlock( &p_owner->lock );
if( !p_aout || !p_aout_input ||
- p_audio->start_date <= VLC_TS_INVALID ||
+ p_audio->i_pts <= VLC_TS_INVALID ||
i_rate < INPUT_RATE_DEFAULT/AOUT_MAX_INPUT_RATE ||
i_rate > INPUT_RATE_DEFAULT*AOUT_MAX_INPUT_RATE )
b_reject = true;
- /* Do not wait against unprotected date */
- const mtime_t i_deadline = p_audio->start_date - AOUT_MAX_PREPARE_TIME;
- while( !b_reject && i_deadline > mdate() )
- {
- vlc_mutex_lock( &p_owner->lock );
- if( p_owner->b_flushing || p_dec->b_die )
- {
- b_reject = true;
- vlc_mutex_unlock( &p_owner->lock );
- break;
- }
- vlc_cond_timedwait( &p_owner->wait_request, &p_owner->lock, i_deadline );
- vlc_mutex_unlock( &p_owner->lock );
- }
+ DecoderWaitDate( p_dec, &b_reject,
+ p_audio->i_pts - AOUT_MAX_PREPARE_TIME );
if( !b_reject )
{
i_decoded++;
if( p_owner->i_preroll_end > VLC_TS_INVALID &&
- p_aout_buf->start_date < p_owner->i_preroll_end )
+ p_aout_buf->i_pts < p_owner->i_preroll_end )
{
aout_DecDeleteBuffer( p_aout, p_aout_input, p_aout_buf );
continue;
decoder_owner_sys_t *p_owner = p_dec->p_owner;
block_t *p_cc;
bool pb_present[4];
+ bool b_processed = false;
int i;
int i_cc_decoder;
else
DecoderProcess( p_owner->cc.pp_decoder[i], p_cc );
i_cc_decoder--;
+ b_processed = true;
}
vlc_mutex_unlock( &p_owner->lock );
+
+ if( !b_processed )
+ block_Release( p_cc );
}
static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
vlc_mutex_unlock( &p_owner->lock );
+ if( p_subpic->i_start <= VLC_TS_INVALID )
+ b_reject = true;
+
+ DecoderWaitDate( p_dec, &b_reject,
+ p_subpic->i_start - SPU_MAX_PREPARE_TIME );
+
if( !b_reject )
- spu_DisplaySubpicture( p_vout->p_spu, p_subpic );
+ spu_DisplaySubpicture( vout_GetSpu( p_vout ), p_subpic );
else
subpicture_Delete( p_subpic );
p_owner->sout.i_id = p_dec->fmt_in.i_id;
if( p_dec->fmt_in.psz_language )
{
- if( p_owner->sout.psz_language )
- free( p_owner->sout.psz_language );
+ free( p_owner->sout.psz_language );
p_owner->sout.psz_language =
strdup( p_dec->fmt_in.psz_language );
}
p_vout = input_resource_HoldVout( p_input->p->p_resource );
if( p_vout && p_owner->p_spu_vout == p_vout )
- spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR,
+ spu_Control( vout_GetSpu( p_vout ), SPU_CHANNEL_CLEAR,
p_owner->i_spu_channel );
if( p_vout )
}
#ifdef ENABLE_SOUT
- if( vlc_internals( p_dec )->i_object_type == VLC_OBJECT_PACKETIZER )
+ if( p_owner->b_packetizer )
{
if( p_block )
p_block->i_flags &= ~BLOCK_FLAG_CORE_PRIVATE_MASK;
if( p_vout )
{
if( p_owner->p_spu_vout == p_vout )
- spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR, p_owner->i_spu_channel );
+ spu_Control( vout_GetSpu( p_vout ), SPU_CHANNEL_CLEAR, p_owner->i_spu_channel );
vlc_object_release( p_vout );
}
}
if( p_owner->p_aout_input == NULL )
{
- const int i_force_dolby = config_GetInt( p_dec, "force-dolby-surround" );
+ const int i_force_dolby = var_InheritInteger( p_dec, "force-dolby-surround" );
audio_sample_format_t format;
aout_input_t *p_aout_input;
aout_instance_t *p_aout;
p_dec->fmt_out.video.i_width != p_owner->video.i_width ||
p_dec->fmt_out.video.i_height != p_owner->video.i_height ||
p_dec->fmt_out.video.i_chroma != p_owner->video.i_chroma ||
- p_dec->fmt_out.video.i_aspect != p_owner->video.i_aspect )
+ (int64_t)p_dec->fmt_out.video.i_sar_num * p_owner->video.i_sar_den !=
+ (int64_t)p_dec->fmt_out.video.i_sar_den * p_owner->video.i_sar_num )
{
vout_thread_t *p_vout;
var_CreateGetBool( p_dec, "hdtv-fix" ) )
{
p_dec->fmt_out.video.i_visible_height = 1080;
- p_dec->fmt_out.video.i_sar_num *= 135;
- p_dec->fmt_out.video.i_sar_den *= 136;
+ if( !(p_dec->fmt_out.video.i_sar_num % 136))
+ {
+ p_dec->fmt_out.video.i_sar_num *= 135;
+ p_dec->fmt_out.video.i_sar_den *= 136;
+ }
msg_Warn( p_dec, "Fixing broken HDTV stream (display_height=1088)");
}
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_visible_height;
-
- p_dec->fmt_out.video.i_sar_den = VOUT_ASPECT_FACTOR *
- p_dec->fmt_out.video.i_visible_width;
+ p_dec->fmt_out.video.i_sar_num = 1;
+ p_dec->fmt_out.video.i_sar_den = 1;
}
vlc_ureduce( &p_dec->fmt_out.video.i_sar_num,
vlc_mutex_unlock( &p_owner->lock );
- spu_Control( p_vout->p_spu, SPU_CHANNEL_REGISTER,
+ spu_Control( vout_GetSpu( p_vout ), SPU_CHANNEL_REGISTER,
&p_owner->i_spu_channel );
p_owner->i_spu_order = 0;
p_owner->p_spu_vout = p_vout;
projects / vlc / blobdiff