X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=f7ec650a5875ccb3acbb4864f4ad14e27280ab2c;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=adc4f6949055d8fd4b1993b69f75107c0c47f262;hpb=3dc6aa515a0d632a5db016669e648917be2008c1;p=vlc diff --git a/src/input/decoder.c b/src/input/decoder.c index adc4f69490..f7ec650a58 100644 --- a/src/input/decoder.c +++ b/src/input/decoder.c @@ -38,21 +38,23 @@ #include #include #include -#include +#include #include +#include +#include -#include #include "audio_output/aout_internal.h" #include "stream_output/stream_output.h" #include "input_internal.h" #include "clock.h" #include "decoder.h" #include "event.h" -#include "ressource.h" +#include "resource.h" #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 * ); @@ -74,7 +76,7 @@ static void vout_del_buffer( decoder_t *, picture_t * ); static void vout_link_picture( decoder_t *, picture_t * ); static void vout_unlink_picture( decoder_t *, picture_t * ); -static subpicture_t *spu_new_buffer( decoder_t * ); +static subpicture_t *spu_new_buffer( decoder_t *, const subpicture_updater_t * ); static void spu_del_buffer( decoder_t *, subpicture_t * ); struct decoder_owner_sys_t @@ -94,6 +96,7 @@ struct decoder_owner_sys_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; @@ -110,7 +113,8 @@ struct decoder_owner_sys_t /* Lock for communication with decoder thread */ vlc_mutex_t lock; - vlc_cond_t wait; + vlc_cond_t wait_request; + vlc_cond_t wait_acknowledge; /* -- These variables need locking on write(only) -- */ aout_instance_t *p_aout; @@ -210,13 +214,15 @@ void decoder_DeleteAudioBuffer( decoder_t *p_decoder, aout_buffer_t *p_buffer ) p_decoder->pf_aout_buffer_del( p_decoder, p_buffer ); } -subpicture_t *decoder_NewSubpicture( decoder_t *p_decoder ) +subpicture_t *decoder_NewSubpicture( decoder_t *p_decoder, + const subpicture_updater_t *p_dyn ) { - subpicture_t *p_subpicture = p_decoder->pf_spu_buffer_new( p_decoder ); + subpicture_t *p_subpicture = p_decoder->pf_spu_buffer_new( p_decoder, p_dyn ); if( !p_subpicture ) msg_Warn( p_decoder, "can't get output subpicture" ); return p_subpicture; } + void decoder_DeleteSubpicture( decoder_t *p_decoder, subpicture_t *p_subpicture ) { p_decoder->pf_spu_buffer_del( p_decoder, p_subpicture ); @@ -238,7 +244,7 @@ int decoder_GetInputAttachments( decoder_t *p_dec, mtime_t decoder_GetDisplayDate( decoder_t *p_dec, mtime_t i_ts ) { if( !p_dec->pf_get_display_date ) - return 0; + return VLC_TS_INVALID; return p_dec->pf_get_display_date( p_dec, i_ts ); } @@ -260,37 +266,22 @@ int decoder_GetDisplayRate( decoder_t *p_dec ) * \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" ); - 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, 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" ); - intf_UserFatal( p_input, false, _("Streaming / Transcoding failed"), - _("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 ) @@ -298,7 +289,6 @@ decoder_t *input_DecoderNew( input_thread_t *p_input, DecoderUnsupportedCodec( p_dec, fmt->i_codec ); DeleteDecoder( p_dec ); - vlc_object_release( p_dec ); return NULL; } @@ -316,7 +306,6 @@ decoder_t *input_DecoderNew( input_thread_t *p_input, msg_Err( p_dec, "cannot spawn decoder thread" ); module_unneed( p_dec, p_dec->p_module ); DeleteDecoder( p_dec ); - vlc_object_release( p_dec ); return NULL; } @@ -342,7 +331,7 @@ void input_DecoderDelete( decoder_t *p_dec ) p_owner->b_paused = false; p_owner->b_buffering = false; p_owner->b_flushing = true; - vlc_cond_signal( &p_owner->wait ); + vlc_cond_signal( &p_owner->wait_request ); vlc_mutex_unlock( &p_owner->lock ); vlc_thread_join( p_dec ); @@ -358,11 +347,8 @@ void input_DecoderDelete( decoder_t *p_dec ) input_DecoderSetCcState( p_dec, false, i ); } - /* Delete decoder configuration */ + /* Delete decoder */ DeleteDecoder( p_dec ); - - /* Delete the decoder */ - vlc_object_release( p_dec ); } /** @@ -372,11 +358,11 @@ void input_DecoderDelete( decoder_t *p_dec ) * \param p_dec the decoder object * \param p_block the data block */ -void input_DecoderDecode( decoder_t *p_dec, block_t *p_block ) +void input_DecoderDecode( decoder_t *p_dec, block_t *p_block, bool b_do_pace ) { decoder_owner_sys_t *p_owner = p_dec->p_owner; - if( p_owner->p_input->p->b_out_pace_control ) + if( b_do_pace ) { /* The fifo is not consummed when buffering and so will * deadlock vlc. @@ -385,7 +371,11 @@ void input_DecoderDecode( decoder_t *p_dec, block_t *p_block ) if( !p_owner->b_buffering ) block_FifoPace( p_owner->p_fifo, 10, SIZE_MAX ); } - else if( block_FifoSize( p_owner->p_fifo ) > 50000000 /* 50 MB */ ) +#ifdef __arm__ + else if( block_FifoSize( p_owner->p_fifo ) > 50*1024*1024 /* 50 MiB */ ) +#else + else if( block_FifoSize( p_owner->p_fifo ) > 400*1024*1024 /* 400 MiB, ie ~ 50mb/s for 60s */ ) +#endif { /* FIXME: ideally we would check the time amount of data * in the FIFO instead of its size. */ @@ -399,10 +389,19 @@ void input_DecoderDecode( decoder_t *p_dec, block_t *p_block ) bool input_DecoderIsEmpty( decoder_t * p_dec ) { - assert( !p_dec->p_owner->b_buffering ); + decoder_owner_sys_t *p_owner = p_dec->p_owner; + assert( !p_owner->b_buffering ); - /* FIXME that's not really true */ - return block_FifoCount( p_dec->p_owner->p_fifo ) <= 0; + bool b_empty = block_FifoCount( p_dec->p_owner->p_fifo ) <= 0; + if( b_empty ) + { + vlc_mutex_lock( &p_owner->lock ); + /* TODO audio support */ + if( p_dec->fmt_out.i_cat == VIDEO_ES && p_owner->p_vout ) + b_empty = vout_IsEmpty( p_owner->p_vout ); + vlc_mutex_unlock( &p_owner->lock ); + } + return b_empty; } void input_DecoderIsCcPresent( decoder_t *p_dec, bool pb_present[4] ) @@ -436,19 +435,18 @@ int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel ) 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" ); - intf_UserFatal( p_dec, false, _("Streaming / Transcoding failed"), - _("VLC could not open the decoder module.") ); + dialog_Fatal( p_dec, _("Streaming / Transcoding failed"), "%s", + _("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; } p_cc->p_owner->p_clock = p_owner->p_clock; @@ -471,7 +469,6 @@ int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel ) vlc_object_kill( p_cc ); module_unneed( p_cc, p_cc->p_module ); DeleteDecoder( p_cc ); - vlc_object_release( p_cc ); } } return VLC_SUCCESS; @@ -501,7 +498,7 @@ void input_DecoderChangePause( decoder_t *p_dec, bool b_paused, mtime_t i_date ) p_owner->b_paused = b_paused; p_owner->pause.i_date = i_date; p_owner->pause.i_ignore = 0; - vlc_cond_signal( &p_owner->wait ); + vlc_cond_signal( &p_owner->wait_request ); DecoderOutputChangePause( p_dec, b_paused, i_date ); @@ -547,7 +544,7 @@ void input_DecoderStartBuffering( decoder_t *p_dec ) p_owner->b_buffering = true; - vlc_cond_signal( &p_owner->wait ); + vlc_cond_signal( &p_owner->wait_request ); vlc_mutex_unlock( &p_owner->lock ); } @@ -560,7 +557,7 @@ void input_DecoderStopBuffering( decoder_t *p_dec ) p_owner->b_buffering = false; - vlc_cond_signal( &p_owner->wait ); + vlc_cond_signal( &p_owner->wait_request ); vlc_mutex_unlock( &p_owner->lock ); } @@ -574,7 +571,7 @@ void input_DecoderWaitBuffering( decoder_t *p_dec ) while( vlc_object_alive( p_dec ) && p_owner->b_buffering && !p_owner->buffer.b_full ) { block_FifoWake( p_owner->p_fifo ); - vlc_cond_wait( &p_owner->wait, &p_owner->lock ); + vlc_cond_wait( &p_owner->wait_acknowledge, &p_owner->lock ); } vlc_mutex_unlock( &p_owner->lock ); @@ -593,7 +590,7 @@ void input_DecoderFrameNext( decoder_t *p_dec, mtime_t *pi_duration ) { vout_NextPicture( p_owner->p_vout, pi_duration ); p_owner->pause.i_ignore++; - vlc_cond_signal( &p_owner->wait ); + vlc_cond_signal( &p_owner->wait_request ); } } else @@ -632,6 +629,26 @@ bool input_DecoderHasFormatChanged( decoder_t *p_dec, es_format_t *p_fmt, vlc_me 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 ); +} + +void input_DecoderGetObjects( decoder_t *p_dec, + vout_thread_t **pp_vout, aout_instance_t **pp_aout ) +{ + decoder_owner_sys_t *p_owner = p_dec->p_owner; + + vlc_mutex_lock( &p_owner->lock ); + if( pp_vout ) + *pp_vout = p_owner->p_vout ? vlc_object_hold( p_owner->p_vout ) : NULL; + if( pp_aout ) + *pp_aout = p_owner->p_aout ? vlc_object_hold( p_owner->p_aout ) : NULL; + vlc_mutex_unlock( &p_owner->lock ); +} + /***************************************************************************** * Internal functions *****************************************************************************/ @@ -648,14 +665,14 @@ static mtime_t DecoderGetDisplayDate( decoder_t *p_dec, mtime_t i_ts ) vlc_mutex_lock( &p_owner->lock ); if( p_owner->b_buffering || p_owner->b_paused ) - i_ts = 0; + i_ts = VLC_TS_INVALID; vlc_mutex_unlock( &p_owner->lock ); - if( !p_owner->p_clock || !i_ts ) + if( !p_owner->p_clock || i_ts <= VLC_TS_INVALID ) return i_ts; if( input_clock_ConvertTS( p_owner->p_clock, NULL, &i_ts, NULL, INT64_MAX ) ) - return 0; + return VLC_TS_INVALID; return i_ts; } @@ -671,12 +688,13 @@ static int DecoderGetDisplayRate( decoder_t *p_dec ) /* */ 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 ); - 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 ); + dialog_Fatal( p_dec, _("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 ); } @@ -685,19 +703,19 @@ static void DecoderUnsupportedCodec( decoder_t *p_dec, vlc_fourcc_t codec ) * * \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_custom_create( p_input, sizeof( *p_dec ), VLC_OBJECT_DECODER, + "decoder" ); if( p_dec == NULL ) return NULL; @@ -723,7 +741,7 @@ static decoder_t * CreateDecoder( input_thread_t *p_input, vlc_object_release( p_dec ); return NULL; } - p_dec->p_owner->i_preroll_end = -1; + p_dec->p_owner->i_preroll_end = VLC_TS_INVALID; p_dec->p_owner->i_last_rate = INPUT_RATE_DEFAULT; p_dec->p_owner->p_input = p_input; p_dec->p_owner->p_aout = NULL; @@ -735,6 +753,7 @@ static decoder_t * CreateDecoder( input_thread_t *p_input, 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 ) @@ -761,17 +780,18 @@ static decoder_t * CreateDecoder( input_thread_t *p_input, 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_custom_create( p_input, sizeof( decoder_t ), + VLC_OBJECT_DECODER, "packetizer" ); if( p_dec->p_owner->p_packetizer ) { es_format_Copy( &p_dec->p_owner->p_packetizer->fmt_in, @@ -789,7 +809,6 @@ static decoder_t * CreateDecoder( input_thread_t *p_input, 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_release( p_dec->p_owner->p_packetizer ); } } @@ -798,7 +817,7 @@ static decoder_t * CreateDecoder( input_thread_t *p_input, /* 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] ) { @@ -815,14 +834,15 @@ static decoder_t * CreateDecoder( input_thread_t *p_input, /* */ vlc_mutex_init( &p_owner->lock ); - vlc_cond_init( &p_owner->wait ); + vlc_cond_init( &p_owner->wait_request ); + vlc_cond_init( &p_owner->wait_acknowledge ); p_owner->b_fmt_description = false; es_format_Init( &p_owner->fmt_description, UNKNOWN_ES, 0 ); p_owner->p_description = NULL; p_owner->b_paused = false; - p_owner->pause.i_date = 0; + p_owner->pause.i_date = VLC_TS_INVALID; p_owner->pause.i_ignore = 0; p_owner->b_buffering = false; @@ -838,7 +858,7 @@ static decoder_t * CreateDecoder( input_thread_t *p_input, /* */ 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; @@ -846,7 +866,7 @@ static decoder_t * CreateDecoder( input_thread_t *p_input, 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; @@ -914,32 +934,17 @@ static void DecoderFlush( decoder_t *p_dec ) /* Monitor for flush end */ p_owner->b_flushing = true; - vlc_cond_signal( &p_owner->wait ); + vlc_cond_signal( &p_owner->wait_request ); /* Send a special block */ block_t *p_null = DecoderBlockFlushNew(); if( !p_null ) return; - input_DecoderDecode( p_dec, p_null ); + input_DecoderDecode( p_dec, p_null, false ); /* */ while( vlc_object_alive( p_dec ) && p_owner->b_flushing ) - vlc_cond_wait( &p_owner->wait, &p_owner->lock ); -} - -static void DecoderSignalFlushed( decoder_t *p_dec ) -{ - decoder_owner_sys_t *p_owner = p_dec->p_owner; - - vlc_mutex_lock( &p_owner->lock ); - - if( p_owner->b_flushing ) - { - p_owner->b_flushing = false; - vlc_cond_signal( &p_owner->wait ); - } - - vlc_mutex_unlock( &p_owner->lock ); + vlc_cond_wait( &p_owner->wait_acknowledge, &p_owner->lock ); } static void DecoderSignalBuffering( decoder_t *p_dec, bool b_full ) @@ -952,7 +957,7 @@ static void DecoderSignalBuffering( decoder_t *p_dec, bool b_full ) { if( b_full ) p_owner->buffer.b_full = true; - vlc_cond_signal( &p_owner->wait ); + vlc_cond_signal( &p_owner->wait_acknowledge ); } vlc_mutex_unlock( &p_owner->lock ); @@ -995,7 +1000,7 @@ static void DecoderWaitUnblock( decoder_t *p_dec, bool *pb_reject ) if( !p_owner->b_buffering || !p_owner->buffer.b_full ) break; } - vlc_cond_wait( &p_owner->wait, &p_owner->lock ); + vlc_cond_wait( &p_owner->wait_request, &p_owner->lock ); } if( pb_reject ) @@ -1028,10 +1033,10 @@ 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 ) + else if( p->i_dts > VLC_TS_INVALID ) *pi_preroll = __MIN( *pi_preroll, p->i_dts ); + else if( p->i_pts > VLC_TS_INVALID ) + *pi_preroll = __MIN( *pi_preroll, p->i_pts ); } static mtime_t DecoderTeletextFixTs( mtime_t i_ts ) @@ -1039,7 +1044,7 @@ static mtime_t DecoderTeletextFixTs( mtime_t i_ts ) mtime_t current_date = mdate(); /* FIXME I don't really like that, es_out SHOULD do it using the video pts */ - if( !i_ts || i_ts > current_date + 10000000 || i_ts < current_date ) + if( i_ts <= VLC_TS_INVALID || i_ts > current_date + 10000000 || i_ts < current_date ) { /* ETSI EN 300 472 Annex A : do not take into account the PTS * for teletext streams. */ @@ -1063,13 +1068,13 @@ static void DecoderFixTs( decoder_t *p_dec, mtime_t *pi_ts0, mtime_t *pi_ts1, const bool b_ephemere = pi_ts1 && *pi_ts0 == *pi_ts1; int i_rate; - if( *pi_ts0 > 0 ) + if( *pi_ts0 > VLC_TS_INVALID ) { *pi_ts0 += i_es_delay; - if( pi_ts1 && *pi_ts1 > 0 ) + if( pi_ts1 && *pi_ts1 > VLC_TS_INVALID ) *pi_ts1 += i_es_delay; if( input_clock_ConvertTS( p_clock, &i_rate, pi_ts0, pi_ts1, i_ts_bound ) ) - *pi_ts0 = 0; + *pi_ts0 = VLC_TS_INVALID; } else { @@ -1090,12 +1095,41 @@ static void DecoderFixTs( decoder_t *p_dec, mtime_t *pi_ts0, mtime_t *pi_ts1, if( b_telx ) { *pi_ts0 = DecoderTeletextFixTs( *pi_ts0 ); - if( pi_ts1 && *pi_ts1 <= 0 ) + if( pi_ts1 && *pi_ts1 <= VLC_TS_INVALID ) *pi_ts1 = *pi_ts0; } } } +/** + * 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 ) { @@ -1104,7 +1138,7 @@ static void DecoderPlayAudio( decoder_t *p_dec, aout_buffer_t *p_audio, aout_input_t *p_aout_input = p_owner->p_aout_input; /* */ - if( p_audio->start_date <= 0 ) + 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; @@ -1124,10 +1158,10 @@ static void DecoderPlayAudio( decoder_t *p_dec, aout_buffer_t *p_audio, 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 ); + vlc_cond_signal( &p_owner->wait_acknowledge ); } } @@ -1157,34 +1191,22 @@ static void DecoderPlayAudio( decoder_t *p_dec, aout_buffer_t *p_audio, } /* */ - const bool b_dated = p_audio->start_date > 0; + 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 <= 0 || + 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, &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 ) { @@ -1239,19 +1261,20 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block ) } i_decoded++; - if( p_aout_buf->start_date < p_owner->i_preroll_end ) + if( p_owner->i_preroll_end > VLC_TS_INVALID && + p_aout_buf->i_pts < p_owner->i_preroll_end ) { aout_DecDeleteBuffer( p_aout, p_aout_input, p_aout_buf ); continue; } - if( p_owner->i_preroll_end > 0 ) + if( p_owner->i_preroll_end > VLC_TS_INVALID ) { msg_Dbg( p_dec, "End of audio preroll" ); if( p_owner->p_aout && p_owner->p_aout_input ) aout_DecFlush( p_owner->p_aout, p_owner->p_aout_input ); /* */ - p_owner->i_preroll_end = -1; + p_owner->i_preroll_end = VLC_TS_INVALID; } DecoderPlayAudio( p_dec, p_aout_buf, &i_played, &i_lost ); @@ -1277,6 +1300,7 @@ static void DecoderGetCc( decoder_t *p_dec, decoder_t *p_dec_cc ) 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; @@ -1308,8 +1332,12 @@ static void DecoderGetCc( decoder_t *p_dec, decoder_t *p_dec_cc ) 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, @@ -1319,11 +1347,11 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture, vout_thread_t *p_vout = p_owner->p_vout; bool b_first_buffered; - if( p_picture->date <= 0 ) + if( p_picture->date <= VLC_TS_INVALID ) { msg_Warn( p_vout, "non-dated video buffer received" ); *pi_lost_sum += 1; - vout_DropPicture( p_vout, p_picture ); + vout_ReleasePicture( p_vout, p_picture ); return; } @@ -1342,7 +1370,7 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture, p_picture->date - p_owner->buffer.p_picture->date > DECODER_MAX_BUFFERING_VIDEO_DURATION ) { p_owner->buffer.b_full = true; - vlc_cond_signal( &p_owner->wait ); + vlc_cond_signal( &p_owner->wait_acknowledge ); } } b_first_buffered = p_owner->buffer.p_picture != NULL; @@ -1385,7 +1413,7 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture, p_picture->b_force = true; } - const bool b_dated = p_picture->date > 0; + const bool b_dated = p_picture->date > VLC_TS_INVALID; int i_rate = INPUT_RATE_DEFAULT; DecoderFixTs( p_dec, &p_picture->date, NULL, NULL, &i_rate, DECODER_BOGUS_VIDEO_DELAY, false ); @@ -1393,7 +1421,7 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture, vlc_mutex_unlock( &p_owner->lock ); /* */ - if( !p_picture->b_force && p_picture->date <= 0 ) + if( !p_picture->b_force && p_picture->date <= VLC_TS_INVALID ) // FIXME --VLC_TS_INVALID verify video_output/* b_reject = true; if( !b_reject ) @@ -1404,7 +1432,7 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture, vout_Flush( p_vout, p_picture->date ); p_owner->i_last_rate = i_rate; } - vout_DisplayPicture( p_vout, p_picture ); + vout_PutPicture( p_vout, p_picture ); } else { @@ -1414,7 +1442,7 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture, msg_Warn( p_vout, "non-dated video buffer received" ); *pi_lost_sum += 1; - vout_DropPicture( p_vout, p_picture ); + vout_ReleasePicture( p_vout, p_picture ); } int i_tmp_display; int i_tmp_lost; @@ -1450,7 +1478,7 @@ static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block ) if( p_dec->b_die ) { /* It prevent freezing VLC in case of broken decoder */ - vout_DropPicture( p_vout, p_pic ); + vout_ReleasePicture( p_vout, p_pic ); if( p_block ) block_Release( p_block ); break; @@ -1458,19 +1486,19 @@ static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block ) i_decoded++; - if( p_pic->date < p_owner->i_preroll_end ) + if( p_owner->i_preroll_end > VLC_TS_INVALID && p_pic->date < p_owner->i_preroll_end ) { - vout_DropPicture( p_vout, p_pic ); + vout_ReleasePicture( p_vout, p_pic ); continue; } - if( p_owner->i_preroll_end > 0 ) + if( p_owner->i_preroll_end > VLC_TS_INVALID ) { msg_Dbg( p_dec, "End of video preroll" ); if( p_vout ) - vout_Flush( p_vout, 1 ); + vout_Flush( p_vout, VLC_TS_INVALID+1 ); /* */ - p_owner->i_preroll_end = -1; + p_owner->i_preroll_end = VLC_TS_INVALID; } if( p_dec->pf_get_cc && @@ -1502,7 +1530,7 @@ static void DecoderPlaySpu( decoder_t *p_dec, subpicture_t *p_subpic, vout_thread_t *p_vout = p_owner->p_spu_vout; /* */ - if( p_subpic->i_start <= 0 ) + if( p_subpic->i_start <= VLC_TS_INVALID && !b_telx ) { msg_Warn( p_dec, "non-dated spu buffer received" ); subpicture_Delete( p_subpic ); @@ -1524,7 +1552,7 @@ static void DecoderPlaySpu( decoder_t *p_dec, subpicture_t *p_subpic, if( p_owner->buffer.i_count > 0 ) { p_owner->buffer.b_full = true; - vlc_cond_signal( &p_owner->wait ); + vlc_cond_signal( &p_owner->wait_acknowledge ); } } @@ -1559,8 +1587,14 @@ static void DecoderPlaySpu( decoder_t *p_dec, subpicture_t *p_subpic, 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 ); + vout_PutSubpicture( p_vout, p_subpic ); else subpicture_Delete( p_subpic ); @@ -1594,7 +1628,7 @@ static void DecoderPlaySout( decoder_t *p_dec, block_t *p_sout_block, if( p_owner->buffer.i_count > 0 ) { p_owner->buffer.b_full = true; - vlc_cond_signal( &p_owner->wait ); + vlc_cond_signal( &p_owner->wait_acknowledge ); } } @@ -1631,7 +1665,7 @@ static void DecoderPlaySout( decoder_t *p_dec, block_t *p_sout_block, vlc_mutex_unlock( &p_owner->lock ); if( !b_reject ) - sout_InputSendBuffer( p_owner->p_sout_input, p_sout_block ); + sout_InputSendBuffer( p_owner->p_sout_input, p_sout_block ); // FIXME --VLC_TS_INVALID inspect stream_output/* else block_Release( p_sout_block ); @@ -1661,7 +1695,9 @@ static void DecoderFlushBuffering( decoder_t *p_dec ) p_owner->buffer.i_count--; if( p_owner->p_vout ) - vout_DropPicture( p_owner->p_vout, p_picture ); + { + vout_ReleasePicture( p_owner->p_vout, p_picture ); + } if( !p_owner->buffer.p_picture ) p_owner->buffer.pp_picture_next = &p_owner->buffer.p_picture; @@ -1705,7 +1741,7 @@ static void DecoderFlushBuffering( decoder_t *p_dec ) static void DecoderProcessSout( decoder_t *p_dec, block_t *p_block ) { decoder_owner_sys_t *p_owner = (decoder_owner_sys_t *)p_dec->p_owner; - const bool b_telx = p_dec->fmt_in.i_codec == VLC_FOURCC('t','e','l','x'); + const bool b_telx = p_dec->fmt_in.i_codec == VLC_CODEC_TELETEXT; block_t *p_sout_block; while( ( p_sout_block = @@ -1719,8 +1755,7 @@ static void DecoderProcessSout( decoder_t *p_dec, block_t *p_block ) 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 ); } @@ -1755,20 +1790,6 @@ static void DecoderProcessSout( decoder_t *p_dec, block_t *p_block ) p_sout_block = p_next; } - - /* For now it's enough, as only sout impact on this flag */ - if( p_owner->p_sout->i_out_pace_nocontrol > 0 && - p_owner->p_input->p->b_out_pace_control ) - { - msg_Dbg( p_dec, "switching to sync mode" ); - p_owner->p_input->p->b_out_pace_control = false; - } - else if( p_owner->p_sout->i_out_pace_nocontrol <= 0 && - !p_owner->p_input->p->b_out_pace_control ) - { - msg_Dbg( p_dec, "switching to async mode" ); - p_owner->p_input->p->b_out_pace_control = true; - } } } @@ -1819,7 +1840,7 @@ static void DecoderProcessVideo( decoder_t *p_dec, block_t *p_block, bool b_flus } if( b_flush && p_owner->p_vout ) - vout_Flush( p_owner->p_vout, 1 ); + vout_Flush( p_owner->p_vout, VLC_TS_INVALID+1 ); } /* This function process a audio block @@ -1875,7 +1896,7 @@ static void DecoderProcessAudio( decoder_t *p_dec, block_t *p_block, bool b_flus static void DecoderProcessSpu( decoder_t *p_dec, block_t *p_block, bool b_flush ) { decoder_owner_sys_t *p_owner = p_dec->p_owner; - const bool b_telx = p_dec->fmt_in.i_codec == VLC_FOURCC('t','e','l','x'); + const bool b_telx = p_dec->fmt_in.i_codec == VLC_CODEC_TELETEXT; input_thread_t *p_input = p_owner->p_input; vout_thread_t *p_vout; @@ -1887,13 +1908,13 @@ static void DecoderProcessSpu( decoder_t *p_dec, block_t *p_block, bool b_flush stats_UpdateInteger( p_dec, p_input->p->counters.p_decoded_sub, 1, NULL ); vlc_mutex_unlock( &p_input->p->counters.counters_lock ); - p_vout = input_ressource_HoldVout( p_input->p->p_ressource ); + p_vout = input_resource_HoldVout( p_input->p->p_resource ); if( p_vout && p_owner->p_spu_vout == p_vout ) { /* Preroll does not work very well with subtitle */ - if( p_spu->i_start > 0 && + if( p_spu->i_start > VLC_TS_INVALID && p_spu->i_start < p_owner->i_preroll_end && - ( p_spu->i_stop <= 0 || p_spu->i_stop < p_owner->i_preroll_end ) ) + ( p_spu->i_stop <= VLC_TS_INVALID || p_spu->i_stop < p_owner->i_preroll_end ) ) { subpicture_Delete( p_spu ); } @@ -1912,11 +1933,10 @@ static void DecoderProcessSpu( decoder_t *p_dec, block_t *p_block, bool b_flush if( b_flush && p_owner->p_spu_vout ) { - p_vout = input_ressource_HoldVout( p_input->p->p_ressource ); + 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, - p_owner->i_spu_channel ); + vout_FlushSubpictureChannel( p_vout, p_owner->i_spu_channel ); if( p_vout ) vlc_object_release( p_vout ); @@ -1930,10 +1950,15 @@ static void DecoderProcessOnFlush( decoder_t *p_dec ) vlc_mutex_lock( &p_owner->lock ); DecoderFlushBuffering( p_dec ); - vlc_mutex_unlock( &p_owner->lock ); - DecoderSignalFlushed( p_dec ); + if( p_owner->b_flushing ) + { + p_owner->b_flushing = false; + vlc_cond_signal( &p_owner->wait_acknowledge ); + } + vlc_mutex_unlock( &p_owner->lock ); } + /** * Decode a block * @@ -1954,7 +1979,7 @@ static void DecoderProcess( decoder_t *p_dec, block_t *p_block ) } #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; @@ -2041,7 +2066,7 @@ static void DeleteDecoder( decoder_t * p_dec ) aout_DecDelete( p_owner->p_aout, p_owner->p_aout_input ); if( p_owner->p_aout ) { - input_ressource_RequestAout( p_owner->p_input->p->p_ressource, + input_resource_RequestAout( p_owner->p_input->p->p_resource, p_owner->p_aout ); input_SendEventAout( p_owner->p_input ); p_owner->p_aout = NULL; @@ -2050,12 +2075,10 @@ static void DeleteDecoder( decoder_t * p_dec ) { /* Hack to make sure all the the pictures are freed by the decoder * and that the vout is not paused anymore */ - vout_FixLeaks( p_owner->p_vout, true ); - if( p_owner->b_paused ) - vout_ChangePause( p_owner->p_vout, false, mdate() ); + vout_Reset( p_owner->p_vout ); /* */ - input_ressource_RequestVout( p_owner->p_input->p->p_ressource, p_owner->p_vout, NULL, true ); + input_resource_RequestVout( p_owner->p_input->p->p_resource, p_owner->p_vout, NULL, 0, true ); input_SendEventVout( p_owner->p_input ); } @@ -2071,11 +2094,11 @@ static void DeleteDecoder( decoder_t * p_dec ) { vout_thread_t *p_vout; - p_vout = input_ressource_HoldVout( p_owner->p_input->p->p_ressource ); + p_vout = input_resource_HoldVout( p_owner->p_input->p->p_resource ); 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 ); + vout_FlushSubpictureChannel( p_vout, p_owner->i_spu_channel ); vlc_object_release( p_vout ); } } @@ -2096,14 +2119,14 @@ static void DeleteDecoder( decoder_t * p_dec ) es_format_Clean( &p_owner->p_packetizer->fmt_out ); if( p_owner->p_packetizer->p_description ) vlc_meta_Delete( p_owner->p_packetizer->p_description ); - vlc_object_detach( p_owner->p_packetizer ); vlc_object_release( p_owner->p_packetizer ); } - vlc_cond_destroy( &p_owner->wait ); + vlc_cond_destroy( &p_owner->wait_acknowledge ); + vlc_cond_destroy( &p_owner->wait_request ); vlc_mutex_destroy( &p_owner->lock ); - vlc_object_detach( p_dec ); + vlc_object_release( p_dec ); free( p_owner ); } @@ -2135,7 +2158,7 @@ static vout_thread_t *aout_request_vout( void *p_private, decoder_t *p_dec = p_private; input_thread_t *p_input = p_dec->p_owner->p_input; - p_vout = input_ressource_RequestVout( p_input->p->p_ressource, p_vout, p_fmt, b_recyle ); + p_vout = input_resource_RequestVout( p_input->p->p_resource, p_vout, p_fmt, 1, b_recyle ); input_SendEventVout( p_input ); return p_vout; @@ -2168,7 +2191,7 @@ static aout_buffer_t *aout_new_buffer( decoder_t *p_dec, int i_samples ) 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; @@ -2199,7 +2222,7 @@ static aout_buffer_t *aout_new_buffer( decoder_t *p_dec, int i_samples ) p_aout = p_owner->p_aout; if( !p_aout ) - p_aout = input_ressource_RequestAout( p_owner->p_input->p->p_ressource, NULL ); + p_aout = input_resource_RequestAout( p_owner->p_input->p->p_resource, NULL ); p_aout_input = aout_DecNew( p_dec, &p_aout, &format, &p_dec->fmt_out.audio_replay_gain, &request_vout ); @@ -2236,9 +2259,6 @@ static void aout_del_buffer( decoder_t *p_dec, aout_buffer_t *p_buffer ) 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_owner = p_dec->p_owner; @@ -2246,8 +2266,13 @@ static picture_t *vout_new_buffer( decoder_t *p_dec ) if( p_owner->p_vout == NULL || 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 ) + p_dec->fmt_out.video.i_visible_width != p_owner->video.i_visible_width || + p_dec->fmt_out.video.i_visible_height != p_owner->video.i_visible_height || + p_dec->fmt_out.video.i_x_offset != p_owner->video.i_x_offset || + p_dec->fmt_out.video.i_y_offset != p_owner->video.i_y_offset || + p_dec->fmt_out.i_codec != p_owner->video.i_chroma || + (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; @@ -2258,52 +2283,45 @@ 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 ) + video_format_t fmt = p_dec->fmt_out.video; + fmt.i_chroma = p_dec->fmt_out.i_codec; + p_owner->video = fmt; + + if( !fmt.i_visible_width || !fmt.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; + fmt.i_visible_width = p_dec->fmt_in.video.i_visible_width; + fmt.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; + fmt.i_visible_width = fmt.i_width; + fmt.i_visible_height = fmt.i_height; } } - if( p_dec->fmt_out.video.i_visible_height == 1088 && + if( fmt.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; + fmt.i_visible_height = 1080; + if( !(fmt.i_sar_num % 136)) + { + fmt.i_sar_num *= 135; + fmt.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 ) + if( !fmt.i_sar_num || !fmt.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; + fmt.i_sar_num = 1; + fmt.i_sar_den = 1; } - 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_owner->video = p_dec->fmt_out.video; + vlc_ureduce( &fmt.i_sar_num, &fmt.i_sar_den, + fmt.i_sar_num, fmt.i_sar_den, 50000 ); vlc_mutex_lock( &p_owner->lock ); @@ -2313,9 +2331,27 @@ static picture_t *vout_new_buffer( decoder_t *p_dec ) p_owner->p_vout = NULL; vlc_mutex_unlock( &p_owner->lock ); - p_vout = input_ressource_RequestVout( p_owner->p_input->p->p_ressource, - p_vout, &p_dec->fmt_out.video, true ); - + unsigned dpb_size; + switch( p_dec->fmt_in.i_codec ) + { + case VLC_CODEC_H264: + case VLC_CODEC_DIRAC: /* FIXME valid ? */ + dpb_size = 18; + break; + case VLC_CODEC_VP5: + case VLC_CODEC_VP6: + case VLC_CODEC_VP6F: + case VLC_CODEC_VP8: + dpb_size = 3; + break; + default: + dpb_size = 2; + break; + } + p_vout = input_resource_RequestVout( p_owner->p_input->p->p_resource, + p_vout, &fmt, + dpb_size + 1 + DECODER_MAX_BUFFERING_COUNT, + true ); vlc_mutex_lock( &p_owner->lock ); p_owner->p_vout = p_vout; @@ -2330,35 +2366,18 @@ static picture_t *vout_new_buffer( decoder_t *p_dec ) p_dec->b_error = true; return NULL; } - - if( p_owner->video.i_rmask ) - p_owner->p_vout->render.i_rmask = p_owner->video.i_rmask; - if( p_owner->video.i_gmask ) - p_owner->p_vout->render.i_gmask = p_owner->video.i_gmask; - if( p_owner->video.i_bmask ) - p_owner->p_vout->render.i_bmask = p_owner->video.i_bmask; } /* Get a new picture */ for( ;; ) { - picture_t *p_picture; - 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_owner->p_vout ) >= 2 ) - { - p_picture = vout_CreatePicture( p_owner->p_vout, 0, 0, 0 ); - if( p_picture ) - return p_picture; - } + picture_t *p_picture = vout_GetPicture( p_owner->p_vout ); + if( p_picture ) + return p_picture; if( DecoderIsFlushing( p_dec ) ) return NULL; @@ -2367,7 +2386,7 @@ static picture_t *vout_new_buffer( decoder_t *p_dec ) DecoderSignalBuffering( p_dec, true ); /* Check the decoder doesn't leak pictures */ - vout_FixLeaks( p_owner->p_vout, false ); + vout_FixLeaks( p_owner->p_vout ); /* FIXME add a vout_WaitPictureAvailable (timedwait) */ msleep( VOUT_OUTMEM_SLEEP ); @@ -2376,20 +2395,21 @@ static picture_t *vout_new_buffer( decoder_t *p_dec ) static void vout_del_buffer( decoder_t *p_dec, picture_t *p_pic ) { - vout_DropPicture( p_dec->p_owner->p_vout, p_pic ); + vout_ReleasePicture( p_dec->p_owner->p_vout, p_pic ); } static void vout_link_picture( decoder_t *p_dec, picture_t *p_pic ) { - vout_LinkPicture( p_dec->p_owner->p_vout, p_pic ); + vout_HoldPicture( p_dec->p_owner->p_vout, p_pic ); } static void vout_unlink_picture( decoder_t *p_dec, picture_t *p_pic ) { - vout_UnlinkPicture( p_dec->p_owner->p_vout, p_pic ); + vout_ReleasePicture( p_dec->p_owner->p_vout, p_pic ); } -static subpicture_t *spu_new_buffer( decoder_t *p_dec ) +static subpicture_t *spu_new_buffer( decoder_t *p_dec, + const subpicture_updater_t *p_updater ) { decoder_owner_sys_t *p_owner = p_dec->p_owner; vout_thread_t *p_vout = NULL; @@ -2401,7 +2421,7 @@ static subpicture_t *spu_new_buffer( decoder_t *p_dec ) if( p_dec->b_die || p_dec->b_error ) break; - p_vout = input_ressource_HoldVout( p_owner->p_input->p->p_ressource ); + p_vout = input_resource_HoldVout( p_owner->p_input->p->p_resource ); if( p_vout ) break; @@ -2422,13 +2442,12 @@ static subpicture_t *spu_new_buffer( decoder_t *p_dec ) vlc_mutex_unlock( &p_owner->lock ); - spu_Control( p_vout->p_spu, SPU_CHANNEL_REGISTER, - &p_owner->i_spu_channel ); + p_owner->i_spu_channel = vout_RegisterSubpictureChannel( p_vout ); p_owner->i_spu_order = 0; p_owner->p_spu_vout = p_vout; } - p_subpic = subpicture_New(); + p_subpic = subpicture_New( p_updater ); if( p_subpic ) { p_subpic->i_channel = p_owner->i_spu_channel; @@ -2446,7 +2465,7 @@ static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic ) decoder_owner_sys_t *p_owner = p_dec->p_owner; vout_thread_t *p_vout = NULL; - p_vout = input_ressource_HoldVout( p_owner->p_input->p->p_ressource ); + p_vout = input_resource_HoldVout( p_owner->p_input->p->p_resource ); if( !p_vout || p_owner->p_spu_vout != p_vout ) { if( p_vout )