/*****************************************************************************
* decoder.c: Functions for the management of decoders
*****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
+ * Copyright (C) 1999-2004 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <assert.h>
+
#include <vlc/vlc.h>
-#include <vlc/decoder.h>
-#include <vlc/vout.h>
-#include <vlc/input.h>
+#include <vlc_block.h>
+#include <vlc_vout.h>
+#include <vlc_aout.h>
+#include <vlc_sout.h>
+#include <vlc_codec.h>
+#include <vlc_osd.h>
-#include "stream_output.h"
+#include <vlc_interface.h>
+#include "audio_output/aout_internal.h"
+#include "stream_output/stream_output.h"
#include "input_internal.h"
static decoder_t * CreateDecoder( input_thread_t *, es_format_t *, int );
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};
+static es_format_t null_es_format;
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;
/* fifo */
block_fifo_t *p_fifo;
+
+ /* CC */
+ vlc_bool_t b_cc_supported;
+ vlc_mutex_t lock_cc;
+ vlc_bool_t 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, VLC_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 )
+{
+ return i_ts;
+}
/**
* Spawns a new decoder thread
vlc_value_t val;
/* If we are in sout mode, search for packetizer module */
- if( p_input->p_sout && !b_force_decoder )
+ if( p_input->p->p_sout && !b_force_decoder )
{
/* Create the decoder configuration structure */
p_dec = CreateDecoder( p_input, fmt, VLC_OBJECT_PACKETIZER );
if( p_dec == NULL )
{
msg_Err( p_input, "could not create packetizer" );
+ intf_UserFatal( p_input, VLC_FALSE, _("Streaming / Transcoding failed"),
+ _("VLC could not open the packetizer module.") );
return NULL;
}
}
if( p_dec == NULL )
{
msg_Err( p_input, "could not create decoder" );
+ intf_UserFatal( p_input, VLC_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 );
+ DecoderUnsupportedCodec( p_dec, fmt->i_codec );
DeleteDecoder( p_dec );
vlc_object_destroy( p_dec );
return NULL;
}
- if( p_input->p_sout && p_input->input.b_can_pace_control &&
+ if( p_input->p->p_sout && p_input->p->input.b_can_pace_control &&
!b_force_decoder )
{
msg_Dbg( p_input, "stream out mode -> no decoder thread" );
if( vlc_thread_create( p_dec, "decoder", DecoderThread,
i_priority, VLC_FALSE ) )
{
- msg_Err( p_dec, "cannot spawn decoder thread \"%s\"",
- p_dec->p_module->psz_object_name );
+ msg_Err( p_dec, "cannot spawn decoder thread" );
module_Unneed( p_dec, p_dec->p_module );
DeleteDecoder( p_dec );
vlc_object_destroy( p_dec );
*/
void input_DecoderDelete( decoder_t *p_dec )
{
- p_dec->b_die = VLC_TRUE;
+ vlc_object_kill( p_dec );
if( p_dec->p_owner->b_own_thread )
{
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, VLC_FALSE, i );
+ }
+
/* Delete decoder configuration */
DeleteDecoder( p_dec );
{
if( p_dec->p_owner->b_own_thread )
{
- if( p_dec->p_owner->p_input->b_out_pace_control )
+ if( p_dec->p_owner->p_input->p->b_out_pace_control )
{
/* 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. */
msg_Warn( p_dec, "decoder/packetizer fifo full (data not "
- "consummed quickly enough), resetting fifo!" );
+ "consumed quickly enough), resetting fifo!" );
block_FifoEmpty( p_dec->p_owner->p_fifo );
}
}
}
-void input_DecoderDiscontinuity( decoder_t * p_dec )
+void input_DecoderDiscontinuity( decoder_t * p_dec, vlc_bool_t b_flush )
{
block_t *p_null;
/* Empty the fifo */
- if( p_dec->p_owner->b_own_thread )
- {
+ if( p_dec->p_owner->b_own_thread && b_flush )
block_FifoEmpty( p_dec->p_owner->p_fifo );
- }
/* Send a special block */
p_null = block_New( p_dec, 128 );
p_null->i_flags |= BLOCK_FLAG_DISCONTINUITY;
+ /* 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;
memset( p_null->p_buffer, 0, p_null->i_buffer );
input_DecoderDecode( p_dec, p_null );
vlc_bool_t input_DecoderEmpty( decoder_t * p_dec )
{
- if( p_dec->p_owner->b_own_thread && p_dec->p_owner->p_fifo->i_depth > 0 )
+ if( p_dec->p_owner->b_own_thread
+ && block_FifoCount( p_dec->p_owner->p_fifo ) > 0 )
{
return VLC_FALSE;
}
return VLC_TRUE;
}
-#if 0
-/**
- * Create a NULL packet for padding in case of a data loss
- *
- * \param p_input the input thread
- * \param p_es es descriptor
- * \return nothing
- */
-static void input_NullPacket( input_thread_t * p_input,
- es_descriptor_t * p_es )
+void input_DecoderIsCcPresent( decoder_t *p_dec, vlc_bool_t pb_present[4] )
{
-#if 0
- block_t *p_block = block_New( p_input, PADDING_PACKET_SIZE );
- if( p_block )
- {
- memset( p_block->p_buffer, 0, PADDING_PACKET_SIZE );
- p_block->i_flags |= BLOCK_FLAG_DISCONTINUITY;
+ int i;
- block_FifoPut( p_es->p_dec->p_owner->p_fifo, p_block );
- }
-#endif
+ 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 );
}
-
-/**
- * Send a NULL packet to the decoders
- *
- * \param p_input the input thread
- * \return nothing
- */
-void input_EscapeDiscontinuity( input_thread_t * p_input )
+int input_DecoderSetCcState( decoder_t *p_dec, vlc_bool_t b_decode, int i_channel )
{
-#if 0
- unsigned int i_es, i;
+ decoder_owner_sys_t *p_owner = p_dec->p_owner;
- for( i_es = 0; i_es < p_input->stream.i_selected_es_number; i_es++ )
- {
- es_descriptor_t * p_es = p_input->stream.pp_selected_es[i_es];
+ //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( p_es->p_dec != NULL )
+ 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 );
+ if( !p_cc )
{
- for( i = 0; i < PADDING_PACKET_NUMBER; i++ )
- {
- input_NullPacket( p_input, p_es );
- }
+ msg_Err( p_dec, "could not create decoder" );
+ intf_UserFatal( p_dec, VLC_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_destroy( p_cc );
+ return VLC_EGENERIC;
}
- }
-#endif
-}
-
-/**
- * Send a NULL packet to the audio decoders
- *
- * \param p_input the input thread
- * \return nothing
- */
-void input_EscapeAudioDiscontinuity( input_thread_t * p_input )
-{
-#if 0
- unsigned int i_es, i;
- for( i_es = 0; i_es < p_input->stream.i_selected_es_number; i_es++ )
+ 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
{
- es_descriptor_t * p_es = p_input->stream.pp_selected_es[i_es];
+ decoder_t *p_cc;
- if( p_es->p_dec != NULL && p_es->i_cat == AUDIO_ES )
+ 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 )
{
- for( i = 0; i < PADDING_PACKET_NUMBER; i++ )
- {
- input_NullPacket( p_input, p_es );
- }
+ vlc_object_kill( p_cc );
+ module_Unneed( p_cc, p_cc->p_module );
+ DeleteDecoder( p_cc );
+ vlc_object_destroy( p_cc );
}
}
-#endif
+ return VLC_SUCCESS;
+}
+int input_DecoderGetCcState( decoder_t *p_dec, vlc_bool_t *pb_decode, int i_channel )
+{
+ decoder_owner_sys_t *p_owner = p_dec->p_owner;
+
+ *pb_decode = VLC_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;
}
-#endif
/**
* Create a decoder object
es_format_t *fmt, int i_object_type )
{
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 )
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;
/* Initialize the decoder fifo */
p_dec->p_module = NULL;
-
+ memset( &null_es_format, 0, sizeof(es_format_t) );
es_format_Copy( &p_dec->fmt_in, fmt );
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" );
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 = p_input->p->p_sout;
p_dec->p_owner->p_sout_input = NULL;
p_dec->p_owner->p_packetizer = NULL;
}
}
+ /* 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 = VLC_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 = VLC_TRUE;
+ if( p_dec->pf_get_cc )
+ p_owner->b_cc_supported = VLC_TRUE;
+ }
+
+ vlc_mutex_init( p_dec, &p_owner->lock_cc );
+ for( i = 0; i < 4; i++ )
+ {
+ p_owner->pb_cc_present[i] = VLC_FALSE;
+ p_owner->pp_cc[i] = NULL;
+ }
return p_dec;
}
return 0;
}
+static inline void DecoderUpdatePreroll( int64_t *pi_preroll, const block_t *p )
+{
+ if( p->i_flags & (BLOCK_FLAG_PREROLL|BLOCK_FLAG_DISCONTINUITY) )
+ *pi_preroll = INT64_MAX;
+ else if( p->i_pts > 0 )
+ *pi_preroll = __MIN( *pi_preroll, p->i_pts );
+ else if( p->i_dts > 0 )
+ *pi_preroll = __MIN( *pi_preroll, p->i_dts );
+}
+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;
+
+ while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
+ {
+ 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 );
+ continue;
+ }
+
+ if( p_dec->p_owner->i_preroll_end > 0 )
+ {
+ /* FIXME TODO flush audio output (don't know how to do that) */
+ 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 );
+ }
+}
+static void DecoderGetCc( decoder_t *p_dec, decoder_t *p_dec_cc )
+{
+ block_t *p_cc;
+ vlc_bool_t 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 )
+{
+ vlc_mutex_lock( &p_vout->picture_lock );
+
+ if( p_pic->i_status == READY_PICTURE )
+ {
+ /* Grr cannot destroy ready picture by myself so be sure vout won't like it */
+ p_pic->date = 1;
+ }
+ else if( p_pic->i_refcount > 0 )
+ {
+ p_pic->i_status = DISPLAYED_PICTURE;
+ }
+ else
+ {
+ p_pic->i_status = DESTROYED_PICTURE;
+ p_vout->i_heap_size--;
+ }
+
+ vlc_mutex_unlock( &p_vout->picture_lock );
+}
+static void VoutFlushPicture( vout_thread_t *p_vout )
+{
+ int i;
+ vlc_mutex_lock( &p_vout->picture_lock );
+ for( i = 0; i < p_vout->render.i_pictures; i++ )
+ {
+ picture_t *p_pic = p_vout->render.pp_picture[i];
+
+ 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 */
+ p_pic->date = 1;
+ }
+ }
+ 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;
+
+ while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
+ {
+ 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 );
+ 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 );
+ /* */
+ 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_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
+ }
+}
+
/**
* Decode a block
*
*/
static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
{
- int i_rate = p_block ? p_block->i_rate : 1000;
+ 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 )
{
p_dec->p_owner->sout.i_id = p_dec->fmt_in.i_id;
if( p_dec->fmt_in.psz_language )
{
+ if( p_dec->p_owner->sout.psz_language )
+ free( p_dec->p_owner->sout.psz_language );
p_dec->p_owner->sout.psz_language =
strdup( p_dec->fmt_in.psz_language );
}
if( p_dec->p_owner->p_sout_input == NULL )
{
- msg_Err( p_dec, "cannot create packetizer output" );
+ msg_Err( p_dec, "cannot create packetizer output (%4.4s)",
+ (char *)&p_dec->p_owner->sout.i_codec );
p_dec->b_error = VLC_TRUE;
while( p_sout_block )
/* For now it's enough, as only sout inpact on this flag */
if( p_dec->p_owner->p_sout->i_out_pace_nocontrol > 0 &&
- p_dec->p_owner->p_input->b_out_pace_control )
+ p_dec->p_owner->p_input->p->b_out_pace_control )
{
- msg_Dbg( p_dec, "switching to synch mode" );
- p_dec->p_owner->p_input->b_out_pace_control = VLC_FALSE;
+ msg_Dbg( p_dec, "switching to sync mode" );
+ p_dec->p_owner->p_input->p->b_out_pace_control = VLC_FALSE;
}
else if( p_dec->p_owner->p_sout->i_out_pace_nocontrol <= 0 &&
- !p_dec->p_owner->p_input->b_out_pace_control )
+ !p_dec->p_owner->p_input->p->b_out_pace_control )
{
- msg_Dbg( p_dec, "switching to asynch mode" );
- p_dec->p_owner->p_input->b_out_pace_control = VLC_TRUE;
+ msg_Dbg( p_dec, "switching to async mode" );
+ p_dec->p_owner->p_input->p->b_out_pace_control = VLC_TRUE;
}
}
}
else if( p_dec->fmt_in.i_cat == AUDIO_ES )
{
- aout_buffer_t *p_aout_buf;
+ 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 )
{
- 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 );
+ es_format_Clean( &p_dec->fmt_in );
+ es_format_Copy( &p_dec->fmt_in, &p_packetizer->fmt_out );
}
while( p_packetized_block )
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 )) )
- {
- aout_DecPlay( p_dec->p_owner->p_aout,
- p_dec->p_owner->p_aout_input,
- p_aout_buf );
- }
+ DecoderDecodeAudio( p_dec, p_packetized_block );
p_packetized_block = p_next;
}
}
}
- else while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
+ else if( p_block )
{
- aout_DecPlay( p_dec->p_owner->p_aout,
- p_dec->p_owner->p_aout_input, p_aout_buf );
+ DecoderDecodeAudio( p_dec, p_block );
}
}
else if( p_dec->fmt_in.i_cat == VIDEO_ES )
{
- picture_t *p_pic;
+ 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 )
{
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 )) )
- {
- vout_DatePicture( p_dec->p_owner->p_vout, p_pic,
- p_pic->date );
- vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
- }
+ DecoderDecodeVideo( p_dec, p_packetized_block );
p_packetized_block = p_next;
}
}
}
- else while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
+ else if( 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 );
+ DecoderDecodeVideo( p_dec, p_block );
}
}
else if( p_dec->fmt_in.i_cat == SPU_ES )
{
+ input_thread_t *p_input = p_dec->p_owner->p_input;
vout_thread_t *p_vout;
subpicture_t *p_spu;
- while( (p_spu = p_dec->pf_decode_sub( p_dec, &p_block ) ) )
+
+ if( p_block )
+ DecoderUpdatePreroll( &p_dec->p_owner->i_preroll_end, 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 );
+
p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
- if( p_vout )
+ if( p_vout && p_sys->p_spu_vout == p_vout )
{
- spu_DisplaySubpicture( p_vout->p_spu, p_spu );
- vlc_object_release( p_vout );
+ /* 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 );
}
+ else
+ {
+ 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 );
#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 )
vlc_object_destroy( 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 );
if( p_sys->p_aout_input == NULL )
{
+ audio_sample_format_t format;
+ int i_force_dolby = config_GetInt( p_dec, "force-dolby-surround" );
+
p_dec->fmt_out.audio.i_format = p_dec->fmt_out.i_codec;
p_sys->audio = p_dec->fmt_out.audio;
+
+ memcpy( &format, &p_sys->audio, sizeof( audio_sample_format_t ) );
+ if ( i_force_dolby && (format.i_original_channels&AOUT_CHAN_PHYSMASK)
+ == (AOUT_CHAN_LEFT|AOUT_CHAN_RIGHT) )
+ {
+ if ( i_force_dolby == 1 )
+ {
+ format.i_original_channels = format.i_original_channels |
+ AOUT_CHAN_DOLBYSTEREO;
+ }
+ else /* i_force_dolby == 2 */
+ {
+ format.i_original_channels = format.i_original_channels &
+ ~AOUT_CHAN_DOLBYSTEREO;
+ }
+ }
+
p_sys->p_aout_input =
- aout_DecNew( p_dec, &p_sys->p_aout, &p_sys->audio );
+ 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" );
return NULL;
}
+ if( !p_dec->fmt_out.video.i_visible_width ||
+ !p_dec->fmt_out.video.i_visible_height )
+ {
+ if( p_dec->fmt_in.video.i_visible_width &&
+ p_dec->fmt_in.video.i_visible_height )
+ {
+ p_dec->fmt_out.video.i_visible_width =
+ p_dec->fmt_in.video.i_visible_width;
+ p_dec->fmt_out.video.i_visible_height =
+ p_dec->fmt_in.video.i_visible_height;
+ }
+ else
+ {
+ 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;
+ }
+ }
+
+ if( p_dec->fmt_out.video.i_visible_height == 1088 &&
+ 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;
+ 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;
+ }
+
+ vlc_ureduce( &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, 50000 );
+
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" );
static void vout_del_buffer( decoder_t *p_dec, picture_t *p_pic )
{
- vout_DestroyPicture( p_dec->p_owner->p_vout, p_pic );
+ VoutDisplayedPicture( p_dec->p_owner->p_vout, p_pic );
}
static void vout_link_picture( decoder_t *p_dec, picture_t *p_pic )
}
p_subpic = spu_CreateSubpicture( p_vout->p_spu );
- p_subpic->i_channel = p_sys->i_spu_channel;
+ if( p_subpic )
+ {
+ p_subpic->i_channel = p_sys->i_spu_channel;
+ }
vlc_object_release( p_vout );
static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic )
{
- spu_DestroySubpicture( p_dec->p_owner->p_vout->p_spu, 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