X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fdec.c;h=a9eb16ac117172f9050c36a25dd69513afe74856;hb=fa61862474c332412e0341d98f1cf82c067d277a;hp=2e219415a5f86dad948aa0ffc8c76f78cfb5e0d2;hpb=05b378dd459f5cee10755dcacaad794e53fa4be7;p=vlc diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c index 2e219415a5..a9eb16ac11 100644 --- a/src/audio_output/dec.c +++ b/src/audio_output/dec.c @@ -1,8 +1,8 @@ /***************************************************************************** * dec.c : audio output API towards decoders ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: dec.c,v 1.4 2002/12/10 18:22:01 gbazin Exp $ + * Copyright (C) 2002-2007 the VideoLAN team + * $Id$ * * Authors: Christophe Massiot * @@ -18,35 +18,65 @@ * * 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 /* calloc(), malloc(), free() */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include #ifdef HAVE_ALLOCA_H # include #endif -#include "audio_output.h" +#include +#include + #include "aout_internal.h" -/* - * Creation/Deletion - */ +/** FIXME: Ugly but needed to access the counters */ +#include "input/input_internal.h" /***************************************************************************** * aout_DecNew : create a decoder *****************************************************************************/ -static aout_input_t * DecNew( aout_instance_t * p_aout, - audio_sample_format_t * p_format ) +static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout, + audio_sample_format_t *p_format, + audio_replay_gain_t *p_replay_gain ) { aout_input_t * p_input; + input_thread_t * p_input_thread; + + /* Sanitize audio format */ + if( p_format->i_channels > 32 ) + { + msg_Err( p_aout, "too many audio channels (%u)", + p_format->i_channels ); + return NULL; + } + if( p_format->i_channels <= 0 ) + { + msg_Err( p_aout, "no audio channels" ); + return NULL; + } + + if( p_format->i_rate > 192000 ) + { + msg_Err( p_aout, "excessive audio sample frequency (%u)", + p_format->i_rate ); + return NULL; + } + if( p_format->i_rate < 4000 ) + { + msg_Err( p_aout, "too low audio sample frequency (%u)", + p_format->i_rate ); + return NULL; + } /* We can only be called by the decoder, so no need to lock * p_input->lock. */ @@ -55,23 +85,25 @@ static aout_input_t * DecNew( aout_instance_t * p_aout, if ( p_aout->i_nb_inputs >= AOUT_MAX_INPUTS ) { msg_Err( p_aout, "too many inputs already (%d)", p_aout->i_nb_inputs ); - return NULL; + goto error; } p_input = malloc(sizeof(aout_input_t)); if ( p_input == NULL ) - { - msg_Err( p_aout, "out of memory" ); - return NULL; - } + goto error; + memset( p_input, 0, sizeof(aout_input_t) ); - vlc_mutex_init( p_aout, &p_input->lock ); + vlc_mutex_init( &p_input->lock ); p_input->b_changed = 0; p_input->b_error = 1; + + aout_FormatPrepare( p_format ); + memcpy( &p_input->input, p_format, sizeof(audio_sample_format_t) ); - aout_FormatPrepare( &p_input->input ); + if( p_replay_gain ) + p_input->replay_gain = *p_replay_gain; p_aout->pp_inputs[p_aout->i_nb_inputs] = p_input; p_aout->i_nb_inputs++; @@ -80,14 +112,8 @@ static aout_input_t * DecNew( aout_instance_t * p_aout, { int i; - if ( var_Type( p_aout, "audio-device" ) != 0 ) - { - var_Destroy( p_aout, "audio-device" ); - } - if ( var_Type( p_aout, "audio-channels" ) != 0 ) - { - var_Destroy( p_aout, "audio-channels" ); - } + var_Destroy( p_aout, "audio-device" ); + var_Destroy( p_aout, "audio-channels" ); /* Recreate the output using the new format. */ if ( aout_OutputNew( p_aout, p_format ) < 0 ) @@ -119,46 +145,57 @@ static aout_input_t * DecNew( aout_instance_t * p_aout, if ( aout_MixerNew( p_aout ) == -1 ) { aout_OutputDelete( p_aout ); - vlc_mutex_unlock( &p_aout->mixer_lock ); - return NULL; + goto error; } - aout_MixerNew( p_aout ); - aout_InputNew( p_aout, p_input ); vlc_mutex_unlock( &p_aout->mixer_lock ); + p_input->i_desync = var_CreateGetInteger( p_this, "audio-desync" ) * 1000; + + p_input_thread = (input_thread_t *)vlc_object_find( p_this, + VLC_OBJECT_INPUT, FIND_PARENT ); + if( p_input_thread ) + { + p_input->i_pts_delay = p_input_thread->i_pts_delay; + p_input->i_pts_delay += p_input->i_desync; + p_input->p_input_thread = p_input_thread; + vlc_object_release( p_input_thread ); + } + else + { + p_input->i_pts_delay = DEFAULT_PTS_DELAY; + p_input->i_pts_delay += p_input->i_desync; + p_input->p_input_thread = NULL; + } return p_input; + +error: + vlc_mutex_unlock( &p_aout->mixer_lock ); + return NULL; } aout_input_t * __aout_DecNew( vlc_object_t * p_this, aout_instance_t ** pp_aout, - audio_sample_format_t * p_format ) + audio_sample_format_t * p_format, + audio_replay_gain_t *p_replay_gain ) { - if ( *pp_aout == NULL ) + aout_instance_t *p_aout = *pp_aout; + if ( p_aout == NULL ) { - /* Create an audio output if there is none. */ - *pp_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, FIND_ANYWHERE ); + msg_Dbg( p_this, "no aout present, spawning one" ); + p_aout = aout_New( p_this ); - if( *pp_aout == NULL ) - { - msg_Dbg( p_this, "no aout present, spawning one" ); + /* Everything failed, I'm a loser, I just wanna die */ + if( p_aout == NULL ) + return NULL; - *pp_aout = aout_New( p_this ); - /* Everything failed, I'm a loser, I just wanna die */ - if( *pp_aout == NULL ) - { - return NULL; - } - } - else - { - vlc_object_release( *pp_aout ); - } + vlc_object_attach( p_aout, p_this ); + *pp_aout = p_aout; } - return DecNew( *pp_aout, p_format ); + return DecNew( p_this, p_aout, p_format, p_replay_gain ); } /***************************************************************************** @@ -200,6 +237,14 @@ int aout_DecDelete( aout_instance_t * p_aout, aout_input_t * p_input ) { aout_OutputDelete( p_aout ); aout_MixerDelete( p_aout ); + if ( var_Type( p_aout, "audio-device" ) != 0 ) + { + var_Destroy( p_aout, "audio-device" ); + } + if ( var_Type( p_aout, "audio-channels" ) != 0 ) + { + var_Destroy( p_aout, "audio-channels" ); + } } vlc_mutex_unlock( &p_aout->mixer_lock ); @@ -215,8 +260,7 @@ int aout_DecDelete( aout_instance_t * p_aout, aout_input_t * p_input ) /***************************************************************************** * aout_DecNewBuffer : ask for a new empty buffer *****************************************************************************/ -aout_buffer_t * aout_DecNewBuffer( aout_instance_t * p_aout, - aout_input_t * p_input, +aout_buffer_t * aout_DecNewBuffer( aout_input_t * p_input, size_t i_nb_samples ) { aout_buffer_t * p_buffer; @@ -234,24 +278,20 @@ aout_buffer_t * aout_DecNewBuffer( aout_instance_t * p_aout, /* This necessarily allocates in the heap. */ aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_buffer ); - p_buffer->i_nb_samples = i_nb_samples; - p_buffer->i_nb_bytes = i_nb_samples * p_input->input.i_bytes_per_frame - / p_input->input.i_frame_length; + if( p_buffer != NULL ) + p_buffer->i_nb_bytes = i_nb_samples * p_input->input.i_bytes_per_frame + / p_input->input.i_frame_length; /* Suppose the decoder doesn't have more than one buffered buffer */ p_input->b_changed = 0; vlc_mutex_unlock( &p_input->lock ); - if ( p_buffer == NULL ) - { - msg_Err( p_aout, "NULL buffer !" ); - } - else - { - p_buffer->start_date = p_buffer->end_date = 0; - } + if( p_buffer == NULL ) + return NULL; + p_buffer->i_nb_samples = i_nb_samples; + p_buffer->start_date = p_buffer->end_date = 0; return p_buffer; } @@ -261,6 +301,7 @@ aout_buffer_t * aout_DecNewBuffer( aout_instance_t * p_aout, void aout_DecDeleteBuffer( aout_instance_t * p_aout, aout_input_t * p_input, aout_buffer_t * p_buffer ) { + (void)p_aout; (void)p_input; aout_BufferFree( p_buffer ); } @@ -268,7 +309,7 @@ void aout_DecDeleteBuffer( aout_instance_t * p_aout, aout_input_t * p_input, * aout_DecPlay : filter & mix the decoded buffer *****************************************************************************/ int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input, - aout_buffer_t * p_buffer ) + aout_buffer_t * p_buffer, int i_input_rate ) { if ( p_buffer->start_date == 0 ) { @@ -277,8 +318,41 @@ int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input, return -1; } +#ifndef FIXME + /* This hack for #transcode{acodec=...}:display to work -- Courmisch */ + if( i_input_rate == 0 ) + i_input_rate = INPUT_RATE_DEFAULT; +#endif + if( i_input_rate > INPUT_RATE_DEFAULT * AOUT_MAX_INPUT_RATE || + i_input_rate < INPUT_RATE_DEFAULT / AOUT_MAX_INPUT_RATE ) + { + aout_BufferFree( p_buffer ); + return 0; + } + + /* Apply the desynchronisation requested by the user */ + p_buffer->start_date += p_input->i_desync; + p_buffer->end_date += p_input->i_desync; + + if ( p_buffer->start_date > mdate() + p_input->i_pts_delay + + AOUT_MAX_ADVANCE_TIME ) + { + msg_Warn( p_aout, "received buffer in the future (%"PRId64")", + p_buffer->start_date - mdate()); + if( p_input->p_input_thread ) + { + vlc_mutex_lock( &p_input->p_input_thread->p->counters.counters_lock); + stats_UpdateInteger( p_aout, + p_input->p_input_thread->p->counters.p_lost_abuffers, + 1, NULL ); + vlc_mutex_unlock( &p_input->p_input_thread->p->counters.counters_lock); + } + aout_BufferFree( p_buffer ); + return -1; + } + p_buffer->end_date = p_buffer->start_date - + (mtime_t)(p_buffer->i_nb_samples * 1000000) + + (mtime_t)p_buffer->i_nb_samples * 1000000 / p_input->input.i_rate; vlc_mutex_lock( &p_input->lock ); @@ -298,8 +372,8 @@ int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input, / p_input->input.i_rate; aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_new_buffer ); - p_aout->p_vlc->pf_memcpy( p_new_buffer->p_buffer, p_buffer->p_buffer, - p_buffer->i_nb_bytes ); + vlc_memcpy( p_new_buffer->p_buffer, p_buffer->p_buffer, + p_buffer->i_nb_bytes ); p_new_buffer->i_nb_samples = p_buffer->i_nb_samples; p_new_buffer->i_nb_bytes = p_buffer->i_nb_bytes; p_new_buffer->start_date = p_buffer->start_date; @@ -312,7 +386,7 @@ int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input, /* If the buffer is too early, wait a while. */ mwait( p_buffer->start_date - AOUT_MAX_PREPARE_TIME ); - if ( aout_InputPlay( p_aout, p_input, p_buffer ) == -1 ) + if ( aout_InputPlay( p_aout, p_input, p_buffer, i_input_rate ) == -1 ) { vlc_mutex_unlock( &p_input->lock ); return -1; @@ -323,8 +397,15 @@ int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input, /* Run the mixer if it is able to run. */ vlc_mutex_lock( &p_aout->mixer_lock ); aout_MixerRun( p_aout ); + if( p_input->p_input_thread ) + { + vlc_mutex_lock( &p_input->p_input_thread->p->counters.counters_lock); + stats_UpdateInteger( p_aout, + p_input->p_input_thread->p->counters.p_played_abuffers, + 1, NULL ); + vlc_mutex_unlock( &p_input->p_input_thread->p->counters.counters_lock); + } vlc_mutex_unlock( &p_aout->mixer_lock ); return 0; } -