X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fdec.c;h=cd09fac9a2ecf7a13f124a2344a8133ef9f06aa5;hb=434b57e00bfd46602501fa7eccba49ce9e924fb9;hp=0480c6b69a519a981faa8fac6316369aed748080;hpb=5d8bdd3f4d1e5c32cf9b4f49feb7f4c82fa8431d;p=vlc diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c index 0480c6b69a..cd09fac9a2 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.12 2003/10/27 21:54:10 gbazin Exp $ + * Copyright (C) 2002-2007 the VideoLAN team + * $Id$ * * Authors: Christophe Massiot * @@ -18,214 +18,133 @@ * * 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 + +#include +#include -#include "audio_output.h" #include "aout_internal.h" -#include /* for input_thread_t and i_pts_delay */ -/* - * Creation/Deletion +#undef aout_DecNew +/** + * Creates an audio output */ - -/***************************************************************************** - * aout_DecNew : create a decoder - *****************************************************************************/ -static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout, - audio_sample_format_t * p_format ) +aout_input_t *aout_DecNew( audio_output_t *p_aout, + audio_sample_format_t *p_format, + const audio_replay_gain_t *p_replay_gain, + const aout_request_vout_t *p_request_vout ) { - aout_input_t * p_input; - input_thread_t * p_input_thread; - vlc_value_t val; - - /* We can only be called by the decoder, so no need to lock - * p_input->lock. */ - vlc_mutex_lock( &p_aout->mixer_lock ); - - if ( p_aout->i_nb_inputs >= AOUT_MAX_INPUTS ) + /* Sanitize audio format */ + if( p_format->i_channels > 32 ) { - msg_Err( p_aout, "too many inputs already (%d)", p_aout->i_nb_inputs ); + msg_Err( p_aout, "too many audio channels (%u)", + p_format->i_channels ); return NULL; } - - p_input = malloc(sizeof(aout_input_t)); - if ( p_input == NULL ) + if( p_format->i_channels <= 0 ) { - msg_Err( p_aout, "out of memory" ); + msg_Err( p_aout, "no audio channels" ); return NULL; } - - vlc_mutex_init( p_aout, &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) ); - - p_aout->pp_inputs[p_aout->i_nb_inputs] = p_input; - p_aout->i_nb_inputs++; - - if ( p_aout->mixer.b_error ) + if( p_format->i_channels != aout_FormatNbChannels( p_format ) ) { - int i; - - 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 ) - { - for ( i = 0; i < p_aout->i_nb_inputs - 1; i++ ) - { - vlc_mutex_lock( &p_aout->pp_inputs[i]->lock ); - aout_InputDelete( p_aout, p_aout->pp_inputs[i] ); - vlc_mutex_unlock( &p_aout->pp_inputs[i]->lock ); - } - vlc_mutex_unlock( &p_aout->mixer_lock ); - return p_input; - } - - /* Create other input streams. */ - for ( i = 0; i < p_aout->i_nb_inputs - 1; i++ ) - { - vlc_mutex_lock( &p_aout->pp_inputs[i]->lock ); - aout_InputDelete( p_aout, p_aout->pp_inputs[i] ); - aout_InputNew( p_aout, p_aout->pp_inputs[i] ); - vlc_mutex_unlock( &p_aout->pp_inputs[i]->lock ); - } + msg_Err( p_aout, "incompatible audio channels count with layout mask" ); + return NULL; } - else + + if( p_format->i_rate > 192000 ) { - aout_MixerDelete( p_aout ); + msg_Err( p_aout, "excessive audio sample frequency (%u)", + p_format->i_rate ); + return NULL; } - - if ( aout_MixerNew( p_aout ) == -1 ) + if( p_format->i_rate < 4000 ) { - aout_OutputDelete( p_aout ); - vlc_mutex_unlock( &p_aout->mixer_lock ); + msg_Err( p_aout, "too low audio sample frequency (%u)", + p_format->i_rate ); return NULL; } - aout_InputNew( p_aout, p_input ); + aout_input_t *p_input = calloc( 1, sizeof(aout_input_t)); + if( !p_input ) + return NULL; + + p_input->b_error = true; - vlc_mutex_unlock( &p_aout->mixer_lock ); + aout_FormatPrepare( p_format ); - var_Create( p_this, "audio-desync", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_this, "audio-desync", &val ); - p_input->i_desync = val.i_int * 1000; + memcpy( &p_input->input, p_format, + sizeof(audio_sample_format_t) ); + if( p_replay_gain ) + p_input->replay_gain = *p_replay_gain; - 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; - vlc_object_release( p_input_thread ); - } - else - { - p_input->i_pts_delay = DEFAULT_PTS_DELAY; - p_input->i_pts_delay += p_input->i_desync; - } + /* We can only be called by the decoder, so no need to lock + * p_input->lock. */ + aout_owner_t *owner = aout_owner(p_aout); + aout_lock( p_aout ); + assert (owner->input == NULL); - return p_input; -} + var_Destroy( p_aout, "audio-device" ); + var_Destroy( p_aout, "audio-channels" ); -aout_input_t * __aout_DecNew( vlc_object_t * p_this, - aout_instance_t ** pp_aout, - audio_sample_format_t * p_format ) -{ - if ( *pp_aout == NULL ) + /* Recreate the output using the new format. */ + if( aout_OutputNew( p_aout, p_format ) < 0 ) + goto error; + + assert (owner->volume.mixer == NULL); + owner->volume.mixer = aout_MixerNew (p_aout, owner->mixer_format.i_format); + if (owner->volume.mixer == NULL) { - /* Create an audio output if there is none. */ - *pp_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, FIND_ANYWHERE ); - - if( *pp_aout == NULL ) - { - msg_Dbg( p_this, "no aout present, spawning one" ); - - *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 ); - } + aout_OutputDelete( p_aout ); + goto error; } - return DecNew( p_this, *pp_aout, p_format ); + owner->input = p_input; + aout_InputNew( p_aout, p_input, p_request_vout ); + aout_unlock( p_aout ); + return p_input; +error: + aout_unlock( p_aout ); + free( p_input ); + return NULL; } /***************************************************************************** * aout_DecDelete : delete a decoder *****************************************************************************/ -int aout_DecDelete( aout_instance_t * p_aout, aout_input_t * p_input ) +void aout_DecDelete( audio_output_t * p_aout, aout_input_t * p_input ) { - int i_input; - - /* This function can only be called by the decoder itself, so no need - * to lock p_input->lock. */ - vlc_mutex_lock( &p_aout->mixer_lock ); - - for ( i_input = 0; i_input < p_aout->i_nb_inputs; i_input++ ) - { - if ( p_aout->pp_inputs[i_input] == p_input ) - { - break; - } - } - - if ( i_input == p_aout->i_nb_inputs ) - { - msg_Err( p_aout, "cannot find an input to delete" ); - return -1; - } - - /* Remove the input from the list. */ - memmove( &p_aout->pp_inputs[i_input], &p_aout->pp_inputs[i_input + 1], - (AOUT_MAX_INPUTS - i_input - 1) * sizeof(aout_input_t *) ); - p_aout->i_nb_inputs--; + aout_owner_t *owner = aout_owner (p_aout); + struct audio_mixer *mixer; + aout_lock( p_aout ); + /* Remove the input. */ + assert (owner->input == p_input); /* buggy decoder? */ + owner->input = NULL; aout_InputDelete( p_aout, p_input ); - vlc_mutex_destroy( &p_input->lock ); - free( p_input ); + aout_OutputDelete( p_aout ); + mixer = owner->volume.mixer; + owner->volume.mixer = NULL; + var_Destroy( p_aout, "audio-device" ); + var_Destroy( p_aout, "audio-channels" ); - if ( !p_aout->i_nb_inputs ) - { - 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 ); + aout_unlock( p_aout ); - return 0; + aout_MixerDelete (mixer); + free( p_input ); } @@ -236,128 +155,110 @@ 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; - mtime_t duration; - - vlc_mutex_lock( &p_input->lock ); - - if ( p_input->b_error ) + size_t length = i_nb_samples * p_input->input.i_bytes_per_frame + / p_input->input.i_frame_length; + block_t *block = block_Alloc( length ); + if( likely(block != NULL) ) { - vlc_mutex_unlock( &p_input->lock ); - return NULL; + block->i_nb_samples = i_nb_samples; + block->i_pts = block->i_length = 0; } - - duration = (1000000 * (mtime_t)i_nb_samples) / p_input->input.i_rate; - - /* 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; - - /* 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; - } - - return p_buffer; + return block; } /***************************************************************************** * aout_DecDeleteBuffer : destroy an undecoded buffer *****************************************************************************/ -void aout_DecDeleteBuffer( aout_instance_t * p_aout, aout_input_t * p_input, +void aout_DecDeleteBuffer( audio_output_t * p_aout, aout_input_t * p_input, aout_buffer_t * p_buffer ) { + (void)p_aout; (void)p_input; aout_BufferFree( p_buffer ); } /***************************************************************************** * 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 ) +int aout_DecPlay( audio_output_t * p_aout, aout_input_t * p_input, + aout_buffer_t * p_buffer, int i_input_rate ) { - if ( p_buffer->start_date == 0 ) + aout_owner_t *owner = aout_owner (p_aout); + assert( i_input_rate >= INPUT_RATE_DEFAULT / AOUT_MAX_INPUT_RATE && + i_input_rate <= INPUT_RATE_DEFAULT * AOUT_MAX_INPUT_RATE ); + assert( p_buffer->i_pts > 0 ); + + p_buffer->i_length = (mtime_t)p_buffer->i_nb_samples * 1000000 + / p_input->input.i_rate; + + aout_lock( p_aout ); + if( p_input->b_error ) { - msg_Warn( p_aout, "non-dated buffer received" ); + aout_unlock( p_aout ); aout_BufferFree( p_buffer ); return -1; } - /* Apply the desynchronisation requested by the user */ - p_buffer->start_date += p_input->i_desync; - p_buffer->end_date += p_input->i_desync; + /* Input */ + aout_InputCheckAndRestart( p_aout, p_input ); + p_buffer = aout_InputPlay( p_aout, p_input, p_buffer, i_input_rate ); - if ( p_buffer->start_date > mdate() + p_input->i_pts_delay + - AOUT_MAX_ADVANCE_TIME ) + if( p_buffer != NULL ) { - msg_Warn( p_aout, "received buffer in the future ("I64Fd")", - p_buffer->start_date - mdate()); - aout_BufferFree( p_buffer ); - return -1; + /* Mixer */ + float amp = owner->volume.multiplier * p_input->multiplier; + aout_MixerRun (owner->volume.mixer, p_buffer, amp); + + /* Output */ + aout_OutputPlay( p_aout, p_buffer ); } - p_buffer->end_date = p_buffer->start_date - + (mtime_t)(p_buffer->i_nb_samples * 1000000) - / p_input->input.i_rate; + aout_unlock( p_aout ); + return 0; +} - vlc_mutex_lock( &p_input->lock ); +int aout_DecGetResetLost( audio_output_t *p_aout, aout_input_t *p_input ) +{ + int val; - if ( p_input->b_error ) - { - vlc_mutex_unlock( &p_input->lock ); - aout_BufferFree( p_buffer ); - return -1; - } + aout_lock( p_aout ); + val = p_input->i_buffer_lost; + p_input->i_buffer_lost = 0; + aout_unlock( p_aout ); - if ( p_input->b_changed ) - { - /* Maybe the allocation size has changed. Re-allocate a buffer. */ - aout_buffer_t * p_new_buffer; - mtime_t duration = (1000000 * (mtime_t)p_buffer->i_nb_samples) - / 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 ); - 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; - p_new_buffer->end_date = p_buffer->end_date; - aout_BufferFree( p_buffer ); - p_buffer = p_new_buffer; - p_input->b_changed = 0; - } + return val; +} - /* If the buffer is too early, wait a while. */ - mwait( p_buffer->start_date - AOUT_MAX_PREPARE_TIME ); +void aout_DecChangePause( audio_output_t *p_aout, aout_input_t *p_input, bool b_paused, mtime_t i_date ) +{ + aout_owner_t *owner = aout_owner (p_aout); - if ( aout_InputPlay( p_aout, p_input, p_buffer ) == -1 ) - { - vlc_mutex_unlock( &p_input->lock ); - return -1; - } + aout_lock( p_aout ); + assert (owner->input == p_input); - vlc_mutex_unlock( &p_input->lock ); + /* XXX: Should the input date be offset by the pause duration instead? */ + date_Set (&p_input->date, VLC_TS_INVALID); + aout_OutputPause( p_aout, b_paused, i_date ); + aout_unlock( p_aout ); +} + +void aout_DecFlush( audio_output_t *p_aout, aout_input_t *p_input ) +{ + aout_lock( p_aout ); + date_Set (&p_input->date, VLC_TS_INVALID); + aout_OutputFlush( p_aout, false ); + aout_unlock( p_aout ); +} - /* Run the mixer if it is able to run. */ - vlc_mutex_lock( &p_aout->mixer_lock ); - aout_MixerRun( p_aout ); - vlc_mutex_unlock( &p_aout->mixer_lock ); +bool aout_DecIsEmpty( audio_output_t * p_aout, aout_input_t * p_input ) +{ + mtime_t end_date; - return 0; + aout_lock( p_aout ); + /* FIXME: tell output to drain */ + end_date = date_Get (&p_input->date); + aout_unlock( p_aout ); + return end_date == VLC_TS_INVALID || end_date <= mdate(); }