X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fcommon.c;h=b153f0c4de4ecfdb31bcced56ae354b8285d0f30;hb=f5c5756cd6745e80917abfe592b52fa44cc5ee69;hp=61ef09285cd7afe9f9a716ea4a1b1dc6792e9abb;hpb=2560f1d6a78f1d50f074950bb3c5df04d3824b1b;p=vlc diff --git a/src/audio_output/common.c b/src/audio_output/common.c index 61ef09285c..b153f0c4de 100644 --- a/src/audio_output/common.c +++ b/src/audio_output/common.c @@ -43,6 +43,9 @@ 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 @@ -50,7 +53,7 @@ static inline void aout_assert_fifo_locked( aout_instance_t * p_aout, aout_fifo_ int i; for( i = 0; i < p_aout->i_nb_inputs; i++ ) { - if( p_fifo == &p_aout->pp_inputs[i]->fifo) + if( p_fifo == &p_aout->pp_inputs[i]->mixer.fifo) { vlc_assert_locked( &p_aout->input_fifos_lock ); break; @@ -88,8 +91,8 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent ) vlc_mutex_init( &p_aout->mixer_lock ); vlc_mutex_init( &p_aout->output_fifo_lock ); p_aout->i_nb_inputs = 0; - p_aout->mixer.f_multiplier = 1.0; - p_aout->mixer.b_error = 1; + p_aout->mixer_multiplier = 1.0; + p_aout->p_mixer = NULL; p_aout->output.b_error = 1; p_aout->output.b_starving = 1; @@ -144,29 +147,29 @@ unsigned int aout_BitsPerSample( vlc_fourcc_t i_format ) { switch( i_format ) { - case VLC_FOURCC('u','8',' ',' '): - case VLC_FOURCC('s','8',' ',' '): + case VLC_CODEC_U8: + case VLC_CODEC_S8: return 8; - case VLC_FOURCC('u','1','6','l'): - case VLC_FOURCC('s','1','6','l'): - case VLC_FOURCC('u','1','6','b'): - case VLC_FOURCC('s','1','6','b'): + case VLC_CODEC_U16L: + case VLC_CODEC_S16L: + case VLC_CODEC_U16B: + case VLC_CODEC_S16B: return 16; - case VLC_FOURCC('u','2','4','l'): - case VLC_FOURCC('s','2','4','l'): - case VLC_FOURCC('u','2','4','b'): - case VLC_FOURCC('s','2','4','b'): + case VLC_CODEC_U24L: + case VLC_CODEC_S24L: + case VLC_CODEC_U24B: + case VLC_CODEC_S24B: return 24; - case VLC_FOURCC('s','3','2','l'): - case VLC_FOURCC('s','3','2','b'): - case VLC_FOURCC('f','l','3','2'): - case VLC_FOURCC('f','i','3','2'): + case VLC_CODEC_S32L: + case VLC_CODEC_S32B: + case VLC_CODEC_FL32: + case VLC_CODEC_FI32: return 32; - case VLC_FOURCC('f','l','6','4'): + case VLC_CODEC_FL64: return 64; default: @@ -197,6 +200,8 @@ const char * aout_FormatPrintChannels( const audio_sample_format_t * p_format ) { switch ( p_format->i_physical_channels & AOUT_CHAN_PHYSMASK ) { + case AOUT_CHAN_LEFT: + case AOUT_CHAN_RIGHT: case AOUT_CHAN_CENTER: if ( (p_format->i_original_channels & AOUT_CHAN_CENTER) || (p_format->i_original_channels @@ -348,7 +353,7 @@ void aout_FifoInit( aout_instance_t * p_aout, aout_fifo_t * p_fifo, p_fifo->p_first = NULL; p_fifo->pp_last = &p_fifo->p_first; - aout_DateInit( &p_fifo->end_date, i_rate ); + date_Init( &p_fifo->end_date, i_rate, 1 ); } /***************************************************************************** @@ -364,15 +369,15 @@ void aout_FifoPush( aout_instance_t * p_aout, aout_fifo_t * p_fifo, p_fifo->pp_last = &p_buffer->p_next; *p_fifo->pp_last = NULL; /* Enforce the continuity of the stream. */ - if ( aout_DateGet( &p_fifo->end_date ) ) + if ( date_Get( &p_fifo->end_date ) ) { - p_buffer->start_date = aout_DateGet( &p_fifo->end_date ); - p_buffer->end_date = aout_DateIncrement( &p_fifo->end_date, - p_buffer->i_nb_samples ); + p_buffer->start_date = date_Get( &p_fifo->end_date ); + p_buffer->end_date = date_Increment( &p_fifo->end_date, + p_buffer->i_nb_samples ); } else { - aout_DateSet( &p_fifo->end_date, p_buffer->end_date ); + date_Set( &p_fifo->end_date, p_buffer->end_date ); } } @@ -387,7 +392,7 @@ void aout_FifoSet( aout_instance_t * p_aout, aout_fifo_t * p_fifo, (void)p_aout; AOUT_ASSERT_FIFO_LOCKED; - aout_DateSet( &p_fifo->end_date, date ); + date_Set( &p_fifo->end_date, date ); p_buffer = p_fifo->p_first; while ( p_buffer != NULL ) { @@ -409,7 +414,7 @@ void aout_FifoMoveDates( aout_instance_t * p_aout, aout_fifo_t * p_fifo, (void)p_aout; AOUT_ASSERT_FIFO_LOCKED; - aout_DateMove( &p_fifo->end_date, difference ); + date_Move( &p_fifo->end_date, difference ); p_buffer = p_fifo->p_first; while ( p_buffer != NULL ) { @@ -426,7 +431,7 @@ mtime_t aout_FifoNextStart( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) { (void)p_aout; AOUT_ASSERT_FIFO_LOCKED; - return aout_DateGet( &p_fifo->end_date ); + return date_Get( &p_fifo->end_date ); } /***************************************************************************** @@ -481,65 +486,6 @@ void aout_FifoDestroy( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) p_fifo->pp_last = &p_fifo->p_first; } - -/* - * Date management (internal and external) - */ - -/***************************************************************************** - * aout_DateInit : set the divider of an audio_date_t - *****************************************************************************/ -void aout_DateInit( audio_date_t * p_date, uint32_t i_divider ) -{ - p_date->date = 0; - p_date->i_divider = i_divider; - p_date->i_remainder = 0; -} - -/***************************************************************************** - * aout_DateSet : set the date of an audio_date_t - *****************************************************************************/ -void aout_DateSet( audio_date_t * p_date, mtime_t new_date ) -{ - p_date->date = new_date; - p_date->i_remainder = 0; -} - -/***************************************************************************** - * aout_DateMove : move forwards or backwards the date of an audio_date_t - *****************************************************************************/ -void aout_DateMove( audio_date_t * p_date, mtime_t difference ) -{ - p_date->date += difference; -} - -/***************************************************************************** - * aout_DateGet : get the date of an audio_date_t - *****************************************************************************/ -mtime_t aout_DateGet( const audio_date_t * p_date ) -{ - return p_date->date; -} - -/***************************************************************************** - * aout_DateIncrement : increment the date and return the result, taking - * into account rounding errors - *****************************************************************************/ -mtime_t aout_DateIncrement( audio_date_t * p_date, uint32_t i_nb_samples ) -{ - mtime_t i_dividend = INT64_C(1000000) * i_nb_samples; - assert( p_date->i_divider > 0 ); /* uninitialized audio_data_t ? */ - p_date->date += i_dividend / p_date->i_divider; - p_date->i_remainder += (int)(i_dividend % p_date->i_divider); - if ( p_date->i_remainder >= p_date->i_divider ) - { - /* This is Bresenham algorithm. */ - p_date->date++; - p_date->i_remainder -= p_date->i_divider; - } - return p_date->date; -} - /***************************************************************************** * aout_CheckChannelReorder : Check if we need to do some channel re-ordering *****************************************************************************/ @@ -648,3 +594,105 @@ void aout_ChannelReorder( uint8_t *p_buf, int i_buffer, } } } + +/***************************************************************************** + * aout_ChannelExtract: + *****************************************************************************/ +static inline void ExtractChannel( uint8_t *pi_dst, int i_dst_channels, + const uint8_t *pi_src, int i_src_channels, + int i_sample_count, + const int *pi_selection, int i_bytes ) +{ + for( int i = 0; i < i_sample_count; i++ ) + { + for( int j = 0; j < i_dst_channels; j++ ) + memcpy( &pi_dst[j * i_bytes], &pi_src[pi_selection[j] * i_bytes], i_bytes ); + pi_dst += i_dst_channels * i_bytes; + pi_src += i_src_channels * i_bytes; + } +} + +void aout_ChannelExtract( void *p_dst, int i_dst_channels, + const void *p_src, int i_src_channels, + int i_sample_count, const int *pi_selection, int i_bits_per_sample ) +{ + /* It does not work in place */ + assert( p_dst != p_src ); + + /* Force the compiler to inline for the specific cases so it can optimize */ + if( i_bits_per_sample == 8 ) + ExtractChannel( p_dst, i_dst_channels, p_src, i_src_channels, i_sample_count, pi_selection, 1 ); + else if( i_bits_per_sample == 16 ) + ExtractChannel( p_dst, i_dst_channels, p_src, i_src_channels, i_sample_count, pi_selection, 2 ); + else if( i_bits_per_sample == 24 ) + ExtractChannel( p_dst, i_dst_channels, p_src, i_src_channels, i_sample_count, pi_selection, 3 ); + else if( i_bits_per_sample == 32 ) + ExtractChannel( p_dst, i_dst_channels, p_src, i_src_channels, i_sample_count, pi_selection, 4 ); + else if( i_bits_per_sample == 64 ) + ExtractChannel( p_dst, i_dst_channels, p_src, i_src_channels, i_sample_count, pi_selection, 8 ); +} + +bool aout_CheckChannelExtraction( int *pi_selection, + uint32_t *pi_layout, int *pi_channels, + const uint32_t pi_order_dst[AOUT_CHAN_MAX], + const uint32_t *pi_order_src, int i_channels ) +{ + const uint32_t pi_order_dual_mono[] = { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT }; + uint32_t i_layout = 0; + int i_out = 0; + int pi_index[AOUT_CHAN_MAX]; + + /* */ + if( !pi_order_dst ) + pi_order_dst = pi_vlc_chan_order_wg4; + + /* Detect special dual mono case */ + if( i_channels == 2 && + pi_order_src[0] == AOUT_CHAN_CENTER && pi_order_src[1] == AOUT_CHAN_CENTER ) + { + i_layout |= AOUT_CHAN_DUALMONO; + pi_order_src = pi_order_dual_mono; + } + + /* */ + for( int i = 0; i < i_channels; i++ ) + { + /* Ignore unknown or duplicated channels or not present in output */ + if( !pi_order_src[i] || (i_layout & pi_order_src[i]) ) + continue; + + for( int j = 0; j < AOUT_CHAN_MAX; j++ ) + { + if( pi_order_dst[j] == pi_order_src[i] ) + { + assert( i_out < AOUT_CHAN_MAX ); + pi_index[i_out++] = i; + i_layout |= pi_order_src[i]; + break; + } + } + } + + /* */ + for( int i = 0, j = 0; i < AOUT_CHAN_MAX; i++ ) + { + for( int k = 0; k < i_out; k++ ) + { + if( pi_order_dst[i] == pi_order_src[pi_index[k]] ) + { + pi_selection[j++] = pi_index[k]; + break; + } + } + } + + *pi_layout = i_layout; + *pi_channels = i_out; + + for( int i = 0; i < i_out; i++ ) + { + if( pi_selection[i] != i ) + return true; + } + return i_out == i_channels; +}