X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fcommon.c;h=75f4c91f26aa4f2d1f42b8f81a94dbd8f97cdcbe;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=c6a0d686f38ba164adfbaaa7256fc13e12ab2768;hpb=797d3efebf0c1f0b9a4c5f0735f4a0ed900c6f53;p=vlc diff --git a/src/audio_output/common.c b/src/audio_output/common.c index c6a0d686f3..75f4c91f26 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; @@ -100,6 +103,8 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent ) vlc_object_set_destructor( p_aout, aout_Destructor ); + vlc_object_attach( p_aout, p_parent ); + return p_aout; } @@ -111,9 +116,64 @@ 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: + * + * 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) +{ + unsigned allowed; + switch (i) + { + case VOLUME_VARS_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; + break; + default: + abort (); + } + + if (aout_locks & ~allowed) + { + fprintf (stderr, "Illegal audio lock transition (%x -> %x)\n", + aout_locks, aout_locks|i); + vlc_backtrace (); + abort (); + } + aout_locks |= i; +} + +void aout_unlock (unsigned i) +{ + assert (aout_locks & i); + aout_locks &= ~i; +} +#endif /* * Formats management (internal and external) @@ -143,7 +203,7 @@ unsigned int aout_FormatNbChannels( const audio_sample_format_t * p_format ) *****************************************************************************/ 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: @@ -163,11 +223,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: @@ -182,6 +244,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 ) { @@ -369,13 +432,14 @@ void aout_FifoPush( aout_instance_t * p_aout, aout_fifo_t * p_fifo, /* Enforce the continuity of the stream. */ if ( date_Get( &p_fifo->end_date ) ) { - p_buffer->start_date = date_Get( &p_fifo->end_date ); - p_buffer->end_date = date_Increment( &p_fifo->end_date, + p_buffer->i_pts = date_Get( &p_fifo->end_date ); + p_buffer->i_length = date_Increment( &p_fifo->end_date, p_buffer->i_nb_samples ); + p_buffer->i_length -= p_buffer->i_pts; } else { - date_Set( &p_fifo->end_date, p_buffer->end_date ); + date_Set( &p_fifo->end_date, p_buffer->i_pts + p_buffer->i_length ); } } @@ -416,8 +480,7 @@ void aout_FifoMoveDates( aout_instance_t * p_aout, aout_fifo_t * p_fifo, p_buffer = p_fifo->p_first; while ( p_buffer != NULL ) { - p_buffer->start_date += difference; - p_buffer->end_date += difference; + p_buffer->i_pts += difference; p_buffer = p_buffer->p_next; } } @@ -440,7 +503,7 @@ 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->start_date : 0; + return p_fifo->p_first ? p_fifo->p_first->i_pts : 0; } /***************************************************************************** @@ -707,26 +770,133 @@ aout_buffer_t *aout_BufferAlloc(aout_alloc_t *allocation, mtime_t microseconds, return old_buffer; } - aout_buffer_t *buffer; - int i_alloc_size; - - i_alloc_size = (int)( (uint64_t)allocation->i_bytes_per_sec + size_t i_alloc_size = (int)( (uint64_t)allocation->i_bytes_per_sec * (microseconds) / 1000000 + 1 ); - buffer = malloc( i_alloc_size + sizeof(aout_buffer_t) ); - if ( !buffer ) - return NULL; + 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 ); + } - buffer->b_alloc = true; - buffer->i_size = i_alloc_size; - buffer->p_buffer = (uint8_t *)buffer + sizeof(aout_buffer_t); - buffer->b_discontinuity = false; + /* 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; - if ( old_buffer ) + 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 ) { - buffer->start_date = old_buffer->start_date; - buffer->end_date = old_buffer->end_date; + free( ppsz_filter ); + free( psz_list ); + return false; } - return buffer; + 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; } + + +