X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fcommon.c;h=6dd6e9ed51d23572e9ba1db0ee3e5e4b6062903a;hb=1e1f9d10fe0840d515757a5897014b3a5107e045;hp=1c3cb2711f1f84128f37172893a194d6f81d376e;hpb=53aeaf92ec7283b97383acfc709bb5e983f2b0e4;p=vlc diff --git a/src/audio_output/common.c b/src/audio_output/common.c index 1c3cb2711f..6dd6e9ed51 100644 --- a/src/audio_output/common.c +++ b/src/audio_output/common.c @@ -33,6 +33,7 @@ #include #include +#include #include "aout_internal.h" #include "libvlc.h" @@ -40,118 +41,169 @@ * Instances management (internal and external) */ -#define AOUT_ASSERT_FIFO_LOCKED aout_assert_fifo_locked(p_aout, p_fifo) -static inline void aout_assert_fifo_locked( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) -{ -#ifndef NDEBUG - if( !p_aout ) - return; - - if( p_fifo == &p_aout->output.fifo ) - vlc_assert_locked( &p_aout->output_fifo_lock ); - else - { - int i; - for( i = 0; i < p_aout->i_nb_inputs; i++ ) - { - if( p_fifo == &p_aout->pp_inputs[i]->mixer.fifo) - { - vlc_assert_locked( &p_aout->input_fifos_lock ); - break; - } - } - if( i == p_aout->i_nb_inputs ) - vlc_assert_locked( &p_aout->mixer_lock ); - } -#else - (void)p_aout; - (void)p_fifo; -#endif -} - /* Local functions */ static void aout_Destructor( vlc_object_t * p_this ); +#undef aout_New /***************************************************************************** * aout_New: initialize aout structure *****************************************************************************/ -aout_instance_t * __aout_New( vlc_object_t * p_parent ) +audio_output_t *aout_New( vlc_object_t * p_parent ) { - aout_instance_t * p_aout; - - /* Allocate descriptor. */ - p_aout = vlc_custom_create( p_parent, sizeof( *p_aout ), VLC_OBJECT_AOUT, - "audio output" ); - if( p_aout == NULL ) - { + audio_output_t *aout = vlc_custom_create (p_parent, + sizeof (aout_instance_t), + "audio output"); + if (unlikely(aout == NULL)) return NULL; + + aout_owner_t *owner = aout_owner (aout); + + vlc_mutex_init (&owner->lock); + owner->module = NULL; + owner->input = NULL; + vlc_mutex_init (&owner->volume.lock); + owner->volume.multiplier = 1.0; + owner->volume.mixer = NULL; + + aout->pf_play = aout_DecDeleteBuffer; + aout_VolumeNoneInit (aout); + vlc_object_set_destructor (aout, aout_Destructor); + + /* + * Persistent audio output variables + */ + vlc_value_t val, text; + char *str; + + var_Create (aout, "intf-change", VLC_VAR_VOID); + + /* Visualizations */ + var_Create (aout, "visual", VLC_VAR_STRING | VLC_VAR_HASCHOICE); + text.psz_string = _("Visualizations"); + var_Change (aout, "visual", VLC_VAR_SETTEXT, &text, NULL); + val.psz_string = (char *)""; + text.psz_string = _("Disable"); + var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text); + val.psz_string = (char *)"spectrometer"; + text.psz_string = _("Spectrometer"); + var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text); + val.psz_string = (char *)"scope"; + text.psz_string = _("Scope"); + var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text); + val.psz_string = (char *)"spectrum"; + text.psz_string = _("Spectrum"); + var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text); + val.psz_string = (char *)"vuMeter"; + text.psz_string = _("Vu meter"); + var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text); + /* Look for goom plugin */ + if (module_exists ("goom")) + { + val.psz_string = (char *)"goom"; + text.psz_string = (char *)"Goom"; + var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text); + } + /* Look for libprojectM plugin */ + if (module_exists ("projectm")) + { + val.psz_string = (char *)"projectm"; + text.psz_string = (char*)"projectM"; + var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text); + } + str = var_GetNonEmptyString (aout, "effect-list"); + if (str != NULL) + { + var_SetString (aout, "visual", str); + free (str); + } + + /* Equalizer */ + var_Create (aout, "equalizer", VLC_VAR_STRING | VLC_VAR_HASCHOICE); + text.psz_string = _("Equalizer"); + var_Change (aout, "equalizer", VLC_VAR_SETTEXT, &text, NULL); + val.psz_string = (char*)""; + text.psz_string = _("Disable"); + var_Change (aout, "equalizer", VLC_VAR_ADDCHOICE, &val, &text); + { + module_config_t *cfg = config_FindConfig (VLC_OBJECT(aout), + "equalizer-preset"); + if (cfg != NULL) + for (int i = 0; i < cfg->i_list; i++) + { + val.psz_string = (char *)cfg->ppsz_list[i]; + text.psz_string = (char *)cfg->ppsz_list_text[i]; + var_Change (aout, "equalizer", VLC_VAR_ADDCHOICE, &val, &text); + } } - /* Initialize members. */ - vlc_mutex_init( &p_aout->input_fifos_lock ); - vlc_mutex_init( &p_aout->mixer_lock ); - vlc_mutex_init( &p_aout->volume_vars_lock ); - vlc_mutex_init( &p_aout->output_fifo_lock ); - p_aout->i_nb_inputs = 0; - p_aout->mixer_multiplier = 1.0; - p_aout->p_mixer = NULL; - p_aout->output.b_error = 1; - p_aout->output.b_starving = 1; - var_Create( p_aout, "intf-change", VLC_VAR_VOID ); + var_Create (aout, "audio-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT); + text.psz_string = _("Audio filters"); + var_Change (aout, "audio-filter", VLC_VAR_SETTEXT, &text, NULL); + + + var_Create (aout, "audio-visual", VLC_VAR_STRING | VLC_VAR_DOINHERIT); + text.psz_string = _("Audio visualizations"); + var_Change (aout, "audio-visual", VLC_VAR_SETTEXT, &text, NULL); - vlc_object_set_destructor( p_aout, aout_Destructor ); - vlc_object_attach( p_aout, p_parent ); + /* Replay gain */ + var_Create (aout, "audio-replay-gain-mode", + VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + text.psz_string = _("Replay gain"); + var_Change (aout, "audio-replay-gain-mode", VLC_VAR_SETTEXT, &text, NULL); + { + module_config_t *cfg = config_FindConfig (VLC_OBJECT(aout), + "audio-replay-gain-mode"); + if( cfg != NULL ) + for (int i = 0; i < cfg->i_list; i++) + { + val.psz_string = (char *)cfg->ppsz_list[i]; + text.psz_string = (char *)cfg->ppsz_list_text[i]; + var_Change (aout, "audio-replay-gain-mode", VLC_VAR_ADDCHOICE, + &val, &text); + } + } + - return p_aout; + return aout; +} + +void aout_Destroy (audio_output_t *aout) +{ + aout_owner_t *owner = aout_owner (aout); + + if (owner->module != NULL) + aout_Shutdown (aout); + vlc_object_release (aout); } /***************************************************************************** * aout_Destructor: destroy aout structure *****************************************************************************/ -static void aout_Destructor( vlc_object_t * p_this ) +static void aout_Destructor (vlc_object_t *obj) { - aout_instance_t * p_aout = (aout_instance_t *)p_this; - vlc_mutex_destroy( &p_aout->input_fifos_lock ); - vlc_mutex_destroy( &p_aout->mixer_lock ); - vlc_mutex_destroy( &p_aout->volume_vars_lock ); - vlc_mutex_destroy( &p_aout->output_fifo_lock ); + audio_output_t *aout = (audio_output_t *)obj; + aout_owner_t *owner = aout_owner (aout); + + vlc_mutex_destroy (&owner->volume.lock); + vlc_mutex_destroy (&owner->lock); } -/* Lock ordering rules: - * - * Vars Mixer Input IFIFO OFIFO (< Inner lock) - * Vars No! Yes Yes Yes Yes - * Mixer No! No! Yes Yes Yes - * Input No! No! No! Yes Yes - * In FIFOs No! No! No! No! Yes - * Out FIFOs No! No! No! No! No! - * (^ Outer lock) - */ #ifdef AOUT_DEBUG /* Lock debugging */ static __thread unsigned aout_locks = 0; -void aout_lock (unsigned i) +void aout_lock_check (unsigned i) { unsigned allowed; switch (i) { - case VOLUME_VARS_LOCK: + case VOLUME_LOCK: allowed = 0; break; - case MIXER_LOCK: - allowed = VOLUME_VARS_LOCK; - break; - case INPUT_LOCK: - allowed = VOLUME_VARS_LOCK|MIXER_LOCK; - break; - case INPUT_FIFO_LOCK: - allowed = VOLUME_VARS_LOCK|MIXER_LOCK|INPUT_LOCK; - break; - case OUTPUT_FIFO_LOCK: - allowed = VOLUME_VARS_LOCK|MIXER_LOCK|INPUT_LOCK|INPUT_FIFO_LOCK; + case OUTPUT_LOCK: + allowed = VOLUME_LOCK; break; default: abort (); @@ -167,7 +219,7 @@ void aout_lock (unsigned i) aout_locks |= i; } -void aout_unlock (unsigned i) +void aout_unlock_check (unsigned i) { assert (aout_locks & i); aout_locks &= ~i; @@ -187,6 +239,8 @@ unsigned int aout_BitsPerSample( vlc_fourcc_t i_format ) { case VLC_CODEC_U8: case VLC_CODEC_S8: + case VLC_CODEC_ALAW: + case VLC_CODEC_MULAW: return 8; case VLC_CODEC_U16L: @@ -345,26 +399,28 @@ const char * aout_FormatPrintChannels( const audio_sample_format_t * p_format ) return "ERROR"; } -/***************************************************************************** - * aout_FormatPrint : print a format in a human-readable form - *****************************************************************************/ -void aout_FormatPrint( aout_instance_t * p_aout, const char * psz_text, - const audio_sample_format_t * p_format ) +#undef aout_FormatPrint +/** + * Prints an audio sample format in a human-readable form. + */ +void aout_FormatPrint( vlc_object_t *obj, const char *psz_text, + const audio_sample_format_t *p_format ) { - msg_Dbg( p_aout, "%s '%4.4s' %d Hz %s frame=%d samples/%d bytes", psz_text, + msg_Dbg( obj, "%s '%4.4s' %d Hz %s frame=%d samples/%d bytes", psz_text, (char *)&p_format->i_format, p_format->i_rate, aout_FormatPrintChannels( p_format ), p_format->i_frame_length, p_format->i_bytes_per_frame ); } -/***************************************************************************** - * aout_FormatsPrint : print two formats in a human-readable form - *****************************************************************************/ -void aout_FormatsPrint( aout_instance_t * p_aout, const char * psz_text, +#undef aout_FormatsPrint +/** + * Prints two formats in a human-readable form + */ +void aout_FormatsPrint( vlc_object_t *obj, const char * psz_text, const audio_sample_format_t * p_format1, const audio_sample_format_t * p_format2 ) { - msg_Dbg( p_aout, "%s '%4.4s'->'%4.4s' %d Hz->%d Hz %s->%s", + msg_Dbg( obj, "%s '%4.4s'->'%4.4s' %d Hz->%d Hz %s->%s", psz_text, (char *)&p_format1->i_format, (char *)&p_format2->i_format, p_format1->i_rate, p_format2->i_rate, @@ -379,38 +435,31 @@ void aout_FormatsPrint( aout_instance_t * p_aout, const char * psz_text, * before calling any of these functions. */ +#undef aout_FifoInit /***************************************************************************** * aout_FifoInit : initialize the members of a FIFO *****************************************************************************/ -void aout_FifoInit( aout_instance_t * p_aout, aout_fifo_t * p_fifo, - uint32_t i_rate ) +void aout_FifoInit( vlc_object_t *obj, aout_fifo_t * p_fifo, uint32_t i_rate ) { - AOUT_ASSERT_FIFO_LOCKED; - - if( i_rate == 0 ) - { - msg_Err( p_aout, "initialising fifo with zero divider" ); - } + if( unlikely(i_rate == 0) ) + msg_Err( obj, "initialising fifo with zero divider" ); p_fifo->p_first = NULL; p_fifo->pp_last = &p_fifo->p_first; date_Init( &p_fifo->end_date, i_rate, 1 ); + date_Set( &p_fifo->end_date, VLC_TS_INVALID ); } /***************************************************************************** * aout_FifoPush : push a packet into the FIFO *****************************************************************************/ -void aout_FifoPush( aout_instance_t * p_aout, aout_fifo_t * p_fifo, - aout_buffer_t * p_buffer ) +void aout_FifoPush( aout_fifo_t * p_fifo, aout_buffer_t * p_buffer ) { - (void)p_aout; - AOUT_ASSERT_FIFO_LOCKED; - *p_fifo->pp_last = p_buffer; p_fifo->pp_last = &p_buffer->p_next; *p_fifo->pp_last = NULL; /* Enforce the continuity of the stream. */ - if ( date_Get( &p_fifo->end_date ) ) + if( date_Get( &p_fifo->end_date ) != VLC_TS_INVALID ) { p_buffer->i_pts = date_Get( &p_fifo->end_date ); p_buffer->i_length = date_Increment( &p_fifo->end_date, @@ -424,17 +473,13 @@ void aout_FifoPush( aout_instance_t * p_aout, aout_fifo_t * p_fifo, } /***************************************************************************** - * aout_FifoSet : set end_date and trash all buffers (because they aren't - * properly dated) + * aout_FifoReset: trash all buffers *****************************************************************************/ -void aout_FifoSet( aout_instance_t * p_aout, aout_fifo_t * p_fifo, - mtime_t date ) +void aout_FifoReset( aout_fifo_t * p_fifo ) { aout_buffer_t * p_buffer; - (void)p_aout; - AOUT_ASSERT_FIFO_LOCKED; - date_Set( &p_fifo->end_date, date ); + date_Set( &p_fifo->end_date, VLC_TS_INVALID ); p_buffer = p_fifo->p_first; while ( p_buffer != NULL ) { @@ -449,71 +494,40 @@ void aout_FifoSet( aout_instance_t * p_aout, aout_fifo_t * p_fifo, /***************************************************************************** * aout_FifoMoveDates : Move forwards or backwards all dates in the FIFO *****************************************************************************/ -void aout_FifoMoveDates( aout_instance_t * p_aout, aout_fifo_t * p_fifo, - mtime_t difference ) +void aout_FifoMoveDates( aout_fifo_t *fifo, mtime_t difference ) { - aout_buffer_t * p_buffer; - (void)p_aout; - AOUT_ASSERT_FIFO_LOCKED; - - date_Move( &p_fifo->end_date, difference ); - p_buffer = p_fifo->p_first; - while ( p_buffer != NULL ) + if( date_Get( &fifo->end_date ) == VLC_TS_INVALID ) { - p_buffer->i_pts += difference; - p_buffer = p_buffer->p_next; + assert( fifo->p_first == NULL ); + return; } -} -/***************************************************************************** - * aout_FifoNextStart : return the current end_date - *****************************************************************************/ -mtime_t aout_FifoNextStart( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) -{ - (void)p_aout; - AOUT_ASSERT_FIFO_LOCKED; - return date_Get( &p_fifo->end_date ); -} - -/***************************************************************************** - * aout_FifoFirstDate : return the playing date of the first buffer in the - * FIFO - *****************************************************************************/ -mtime_t aout_FifoFirstDate( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) -{ - (void)p_aout; - AOUT_ASSERT_FIFO_LOCKED; - return p_fifo->p_first ? p_fifo->p_first->i_pts : 0; + date_Move( &fifo->end_date, difference ); + for( block_t *block = fifo->p_first; block != NULL; block = block->p_next ) + block->i_pts += difference; } /***************************************************************************** * aout_FifoPop : get the next buffer out of the FIFO *****************************************************************************/ -aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) +aout_buffer_t *aout_FifoPop( aout_fifo_t * p_fifo ) { - aout_buffer_t * p_buffer; - (void)p_aout; - AOUT_ASSERT_FIFO_LOCKED; - - p_buffer = p_fifo->p_first; - if ( p_buffer == NULL ) return NULL; - p_fifo->p_first = p_buffer->p_next; - if ( p_fifo->p_first == NULL ) + aout_buffer_t *p_buffer = p_fifo->p_first; + if( p_buffer != NULL ) { - p_fifo->pp_last = &p_fifo->p_first; + p_fifo->p_first = p_buffer->p_next; + if( p_fifo->p_first == NULL ) + p_fifo->pp_last = &p_fifo->p_first; } - return p_buffer; } /***************************************************************************** * aout_FifoDestroy : destroy a FIFO and its buffers *****************************************************************************/ -void aout_FifoDestroy( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) +void aout_FifoDestroy( aout_fifo_t * p_fifo ) { aout_buffer_t * p_buffer; - (void)p_aout; - AOUT_ASSERT_FIFO_LOCKED; p_buffer = p_fifo->p_first; while ( p_buffer != NULL ) @@ -738,24 +752,6 @@ bool aout_CheckChannelExtraction( int *pi_selection, return i_out == i_channels; } -/***************************************************************************** - * aout_BufferAlloc: - *****************************************************************************/ - -aout_buffer_t *aout_BufferAlloc(aout_alloc_t *allocation, mtime_t microseconds, - aout_buffer_t *old_buffer) -{ - if ( !allocation->b_alloc ) - { - return old_buffer; - } - - size_t i_alloc_size = (int)( (uint64_t)allocation->i_bytes_per_sec - * (microseconds) / 1000000 + 1 ); - - return block_Alloc( i_alloc_size ); -} - /* Return the order in which filters should be inserted */ static int FilterOrder( const char *psz_name ) { @@ -777,7 +773,7 @@ static int FilterOrder( const char *psz_name ) /* This function will add or remove a a module from a string list (colon * separated). It will return true if there is a modification * In case p_aout is NULL, we will use configuration instead of variable */ -bool aout_ChangeFilterString( vlc_object_t *p_obj, aout_instance_t *p_aout, +bool aout_ChangeFilterString( vlc_object_t *p_obj, vlc_object_t *p_aout, const char *psz_variable, const char *psz_name, bool b_add ) {