X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=af31e71c74dbbd270b3c0639bda5ea773b4d5c2d;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=34e965584cfe61d19c35dd4db95b70c5a6bf8238;hpb=752ac121f03ca0710841c88bda6d0eee0210eba6;p=vlc diff --git a/src/input/decoder.c b/src/input/decoder.c index 34e965584c..af31e71c74 100644 --- a/src/input/decoder.c +++ b/src/input/decoder.c @@ -1,11 +1,11 @@ /***************************************************************************** * decoder.c: Functions for the management of decoders ***************************************************************************** - * Copyright (C) 1999-2004 VideoLAN + * Copyright (C) 1999-2004 the VideoLAN team * $Id$ * * Authors: Christophe Massiot - * Gildas Bazin + * Gildas Bazin * Laurent Aimar * * This program is free software; you can redistribute it and/or modify @@ -20,20 +20,24 @@ * * 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 #include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include "stream_output.h" +#include +#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 ); @@ -54,12 +58,14 @@ 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}; +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; @@ -85,6 +91,25 @@ struct decoder_owner_sys_t block_fifo_t *p_fifo; }; +/* 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 ); +} /** * Spawns a new decoder thread @@ -100,13 +125,15 @@ decoder_t *input_DecoderNew( input_thread_t *p_input, 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; } } @@ -117,6 +144,8 @@ decoder_t *input_DecoderNew( input_thread_t *p_input, 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; } } @@ -126,13 +155,17 @@ decoder_t *input_DecoderNew( input_thread_t *p_input, 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 ); 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" ); @@ -156,8 +189,7 @@ decoder_t *input_DecoderNew( input_thread_t *p_input, 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 ); @@ -177,7 +209,7 @@ decoder_t *input_DecoderNew( input_thread_t *p_input, */ 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 ) { @@ -193,6 +225,9 @@ void input_DecoderDelete( decoder_t *p_dec ) } else { + /* Flush */ + input_DecoderDecode( p_dec, NULL ); + module_Unneed( p_dec, p_dec->p_module ); } @@ -213,7 +248,7 @@ void input_DecoderDecode( decoder_t * p_dec, block_t *p_block ) { 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 && @@ -227,7 +262,7 @@ void input_DecoderDecode( decoder_t * p_dec, block_t *p_block ) /* 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 ); } @@ -235,9 +270,9 @@ void input_DecoderDecode( decoder_t * p_dec, block_t *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 { @@ -246,19 +281,20 @@ void input_DecoderDecode( decoder_t * p_dec, block_t *p_block ) } } -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 ); @@ -273,82 +309,6 @@ vlc_bool_t input_DecoderEmpty( decoder_t * p_dec ) 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 ) -{ -#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; - - block_FifoPut( p_es->p_dec->p_owner->p_fifo, p_block ); - } -#endif -} - -/** - * Send a NULL packet to the decoders - * - * \param p_input the input thread - * \return nothing - */ -void input_EscapeDiscontinuity( 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++ ) - { - es_descriptor_t * p_es = p_input->stream.pp_selected_es[i_es]; - - if( p_es->p_dec != NULL ) - { - for( i = 0; i < PADDING_PACKET_NUMBER; i++ ) - { - input_NullPacket( p_input, p_es ); - } - } - } -#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++ ) - { - es_descriptor_t * p_es = p_input->stream.pp_selected_es[i_es]; - - if( p_es->p_dec != NULL && p_es->i_cat == AUDIO_ES ) - { - for( i = 0; i < PADDING_PACKET_NUMBER; i++ ) - { - input_NullPacket( p_input, p_es ); - } - } - } -#endif -} -#endif - /** * Create a decoder object * @@ -374,10 +334,10 @@ static decoder_t * CreateDecoder( input_thread_t *p_input, p_dec->pf_decode_sub = 0; p_dec->pf_packetize = 0; - /* 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_in, fmt ); es_format_Copy( &p_dec->fmt_out, &null_es_format ); @@ -389,13 +349,14 @@ static decoder_t * CreateDecoder( input_thread_t *p_input, 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; @@ -453,6 +414,24 @@ static decoder_t * CreateDecoder( input_thread_t *p_input, } } + /* Copy ourself the input replay gain */ + if( fmt->i_cat == AUDIO_ES ) + { + int i; + 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]; + } + } + } return p_dec; } @@ -494,6 +473,116 @@ static int DecoderThread( decoder_t * 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 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; + } + + 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 * @@ -503,7 +592,10 @@ static int DecoderThread( decoder_t * p_dec ) */ static int DecoderDecode( decoder_t *p_dec, block_t *p_block ) { - if( p_block->i_buffer <= 0 ) + 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 ) { block_Release( p_block ); return VLC_SUCCESS; @@ -513,16 +605,19 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block ) { 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 ) { + 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 ); } @@ -533,7 +628,8 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block ) 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 ) @@ -548,9 +644,10 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block ) 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 ); @@ -560,22 +657,22 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_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; + DecoderUpdatePreroll( &p_dec->p_owner->i_preroll_end, p_block ); if( p_dec->p_owner->p_packetizer ) { @@ -585,23 +682,32 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_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 ) { - aout_DecPlay( p_dec->p_owner->p_aout, - p_dec->p_owner->p_aout_input, p_aout_buf ); + es_format_Clean( &p_dec->fmt_in ); + es_format_Copy( &p_dec->fmt_in, &p_packetizer->fmt_out ); + } + + 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; + + 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 { - 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; + DecoderUpdatePreroll( &p_dec->p_owner->i_preroll_end, p_block ); if( p_dec->p_owner->p_packetizer ) { @@ -611,33 +717,59 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block ) 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 )) ) + 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 ); + } + + 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; + + 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 { - 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; + + DecoderUpdatePreroll( &p_dec->p_owner->i_preroll_end, p_block ); + while( (p_spu = p_dec->pf_decode_sub( p_dec, &p_block ) ) ) { + 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 ) { - vout_DisplaySubPicture( p_vout, 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 @@ -657,8 +789,6 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block ) */ 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 ); @@ -667,7 +797,7 @@ static void DeleteDecoder( decoder_t * p_dec ) 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 ); @@ -688,7 +818,7 @@ static void DeleteDecoder( decoder_t * p_dec ) #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 ) @@ -704,7 +834,8 @@ static void DeleteDecoder( decoder_t * p_dec ) p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE ); if( p_vout ) { - vout_ClearOSDChannel( p_vout, p_dec->p_owner->i_spu_channel ); + spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR, + p_dec->p_owner->i_spu_channel ); vlc_object_release( p_vout ); } } @@ -722,6 +853,8 @@ static void DeleteDecoder( decoder_t * p_dec ) vlc_object_destroy( p_dec->p_owner->p_packetizer ); } + vlc_object_detach( p_dec ); + free( p_dec->p_owner ); } @@ -747,10 +880,30 @@ static aout_buffer_t *aout_new_buffer( decoder_t *p_dec, int i_samples ) 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" ); @@ -791,21 +944,68 @@ static picture_t *vout_new_buffer( decoder_t *p_dec ) 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" ); 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 */ @@ -860,7 +1060,7 @@ static picture_t *vout_new_buffer( decoder_t *p_dec ) 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 ) @@ -877,7 +1077,7 @@ 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_spu; + subpicture_t *p_subpic; int i_attempts = 30; while( i_attempts-- ) @@ -898,20 +1098,38 @@ static subpicture_t *spu_new_buffer( decoder_t *p_dec ) if( p_sys->p_spu_vout != p_vout ) { - p_sys->i_spu_channel = - vout_RegisterOSDChannel( p_vout ); + spu_Control( p_vout->p_spu, SPU_CHANNEL_REGISTER, + &p_sys->i_spu_channel ); p_sys->p_spu_vout = p_vout; } - p_spu = vout_CreateSubPicture( p_vout, p_sys->i_spu_channel, - MEMORY_SUBPICTURE ); + 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_spu; + return p_subpic; } -static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_spu ) +static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic ) { - vout_DestroySubPicture( p_dec->p_owner->p_vout, p_spu ); + 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 ); } +