X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fcommon.c;h=ea6a930010b458625ca7a7cbae2c00a2c5736dbe;hb=2f49119c3b27a6b730c4dd1a82bb69a785c738c6;hp=0c9cda76bc3128136a2c858450ae66c5bf2f82fb;hpb=7a87d5768beaecfc8132a875d08b53ec5b780bee;p=vlc diff --git a/src/audio_output/common.c b/src/audio_output/common.c index 0c9cda76bc..ea6a930010 100644 --- a/src/audio_output/common.c +++ b/src/audio_output/common.c @@ -28,6 +28,7 @@ # include "config.h" #endif +#include #include #include @@ -79,7 +80,8 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent ) aout_instance_t * p_aout; /* Allocate descriptor. */ - p_aout = vlc_object_create( p_parent, VLC_OBJECT_AOUT ); + p_aout = vlc_custom_create( p_parent, sizeof( *p_aout ), VLC_OBJECT_AOUT, + "audio output" ); if( p_aout == NULL ) { return NULL; @@ -88,6 +90,7 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent ) /* 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; @@ -95,8 +98,7 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent ) p_aout->output.b_error = 1; p_aout->output.b_starving = 1; - var_Create( p_aout, "intf-change", VLC_VAR_BOOL ); - var_SetBool( p_aout, "intf-change", true ); + var_Create( p_aout, "intf-change", VLC_VAR_VOID ); vlc_object_set_destructor( p_aout, aout_Destructor ); @@ -111,16 +113,18 @@ static void aout_Destructor( vlc_object_t * p_this ) 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 ); } /* Lock ordering rules: * - * Mixer Input IFIFO OFIFO (< Inner lock) - * Mixer No! N/A Yes Yes - * Input N/A No! Yes N/A - * In FIFOs No! No! No! No! - * Out FIFOs No! N/A Yes No! + * 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 @@ -132,18 +136,23 @@ void aout_lock (unsigned i) unsigned allowed; switch (i) { - case MIXER_LOCK: + case VOLUME_VARS_LOCK: allowed = 0; break; - case INPUT_LOCK: - allowed = 0; + case MIXER_LOCK: + allowed = VOLUME_VARS_LOCK; break; - case OUTPUT_FIFO_LOCK: - allowed = MIXER_LOCK; + case INPUT_LOCK: + allowed = VOLUME_VARS_LOCK|MIXER_LOCK; break; case INPUT_FIFO_LOCK: - allowed = MIXER_LOCK|INPUT_LOCK|OUTPUT_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; break; + default: + abort (); } if (aout_locks & ~allowed) @@ -151,7 +160,7 @@ void aout_lock (unsigned i) fprintf (stderr, "Illegal audio lock transition (%x -> %x)\n", aout_locks, aout_locks|i); vlc_backtrace (); - //abort (); + abort (); } aout_locks |= i; } @@ -167,31 +176,12 @@ void aout_unlock (unsigned i) * Formats management (internal and external) */ -/***************************************************************************** - * aout_FormatNbChannels : return the number of channels - *****************************************************************************/ -unsigned int aout_FormatNbChannels( const audio_sample_format_t * p_format ) -{ - static const uint32_t pi_channels[] = - { AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, - AOUT_CHAN_REARCENTER, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, - AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, AOUT_CHAN_LFE }; - unsigned int i_nb = 0, i; - - for ( i = 0; i < sizeof(pi_channels)/sizeof(uint32_t); i++ ) - { - if ( p_format->i_physical_channels & pi_channels[i] ) i_nb++; - } - - return i_nb; -} - /***************************************************************************** * aout_BitsPerSample : get the number of bits per sample *****************************************************************************/ unsigned int aout_BitsPerSample( vlc_fourcc_t i_format ) { - switch( i_format ) + switch( vlc_fourcc_GetCodec( AUDIO_ES, i_format ) ) { case VLC_CODEC_U8: case VLC_CODEC_S8: @@ -211,11 +201,13 @@ unsigned int aout_BitsPerSample( vlc_fourcc_t i_format ) case VLC_CODEC_S32L: case VLC_CODEC_S32B: - case VLC_CODEC_FL32: + case VLC_CODEC_F32L: + case VLC_CODEC_F32B: case VLC_CODEC_FI32: return 32; - case VLC_CODEC_FL64: + case VLC_CODEC_F64L: + case VLC_CODEC_F64B: return 64; default: @@ -230,6 +222,7 @@ unsigned int aout_BitsPerSample( vlc_fourcc_t i_format ) *****************************************************************************/ void aout_FormatPrepare( audio_sample_format_t * p_format ) { + p_format->i_channels = aout_FormatNbChannels( p_format ); p_format->i_bitspersample = aout_BitsPerSample( p_format->i_format ); if( p_format->i_bitspersample > 0 ) { @@ -760,3 +753,128 @@ aout_buffer_t *aout_BufferAlloc(aout_alloc_t *allocation, mtime_t microseconds, return block_Alloc( i_alloc_size ); } + +/* Return the order in which filters should be inserted */ +static int FilterOrder( const char *psz_name ) +{ + static const struct { + const char *psz_name; + int i_order; + } filter[] = { + { "equalizer", 0 }, + { NULL, INT_MAX }, + }; + for( int i = 0; filter[i].psz_name; i++ ) + { + if( !strcmp( filter[i].psz_name, psz_name ) ) + return filter[i].i_order; + } + return INT_MAX; +} + +/* 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, + const char *psz_variable, + const char *psz_name, bool b_add ) +{ + if( *psz_name == '\0' ) + return false; + + char *psz_list; + if( p_aout ) + { + psz_list = var_GetString( p_aout, psz_variable ); + } + else + { + psz_list = var_CreateGetString( p_obj->p_libvlc, psz_variable ); + var_Destroy( p_obj->p_libvlc, psz_variable ); + } + + /* Split the string into an array of filters */ + int i_count = 1; + for( char *p = psz_list; p && *p; p++ ) + i_count += *p == ':'; + i_count += b_add; + + const char **ppsz_filter = calloc( i_count, sizeof(*ppsz_filter) ); + if( !ppsz_filter ) + { + free( psz_list ); + return false; + } + bool b_present = false; + i_count = 0; + for( char *p = psz_list; p && *p; ) + { + char *psz_end = strchr(p, ':'); + if( psz_end ) + *psz_end++ = '\0'; + else + psz_end = p + strlen(p); + if( *p ) + { + b_present |= !strcmp( p, psz_name ); + ppsz_filter[i_count++] = p; + } + p = psz_end; + } + if( b_present == b_add ) + { + free( ppsz_filter ); + free( psz_list ); + return false; + } + + if( b_add ) + { + int i_order = FilterOrder( psz_name ); + int i; + for( i = 0; i < i_count; i++ ) + { + if( FilterOrder( ppsz_filter[i] ) > i_order ) + break; + } + if( i < i_count ) + memmove( &ppsz_filter[i+1], &ppsz_filter[i], (i_count - i) * sizeof(*ppsz_filter) ); + ppsz_filter[i] = psz_name; + i_count++; + } + else + { + for( int i = 0; i < i_count; i++ ) + { + if( !strcmp( ppsz_filter[i], psz_name ) ) + ppsz_filter[i] = ""; + } + } + size_t i_length = 0; + for( int i = 0; i < i_count; i++ ) + i_length += 1 + strlen( ppsz_filter[i] ); + + char *psz_new = malloc( i_length + 1 ); + *psz_new = '\0'; + for( int i = 0; i < i_count; i++ ) + { + if( *ppsz_filter[i] == '\0' ) + continue; + if( *psz_new ) + strcat( psz_new, ":" ); + strcat( psz_new, ppsz_filter[i] ); + } + free( ppsz_filter ); + free( psz_list ); + + if( p_aout ) + var_SetString( p_aout, psz_variable, psz_new ); + else + config_PutPsz( p_obj, psz_variable, psz_new ); + free( psz_new ); + + return true; +} + + +