X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fcommon.c;h=b674a8da4d2a17e9acf3f44ecff6f765264c05ff;hb=ff58efe4687840ee043d510a51a911917fb9a912;hp=edae9e99d9fc33720254fcf99fc8c2a0dfa9f302;hpb=1e9f16e284a4bb84ac446bf18e6b5581754fc6d3;p=vlc diff --git a/src/audio_output/common.c b/src/audio_output/common.c index edae9e99d9..b674a8da4d 100644 --- a/src/audio_output/common.c +++ b/src/audio_output/common.c @@ -1,8 +1,8 @@ /***************************************************************************** * common.c : audio output management of common data structures ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: common.c,v 1.18 2003/11/16 21:07:31 gbazin Exp $ + * Copyright (C) 2002-2007 the VideoLAN team + * $Id$ * * Authors: Christophe Massiot * @@ -18,25 +18,27 @@ * * 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 "audio_output.h" +#include #include "aout_internal.h" - /* * Instances management (internal and external) */ +/* Local functions */ +static void aout_Destructor( vlc_object_t * p_this ); + /***************************************************************************** * aout_New: initialize aout structure *****************************************************************************/ @@ -53,9 +55,9 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent ) } /* Initialize members. */ - vlc_mutex_init( p_parent, &p_aout->input_fifos_lock ); - vlc_mutex_init( p_parent, &p_aout->mixer_lock ); - vlc_mutex_init( p_parent, &p_aout->output_fifo_lock ); + vlc_mutex_init( &p_aout->input_fifos_lock ); + 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; @@ -63,25 +65,23 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent ) p_aout->output.b_starving = 1; var_Create( p_aout, "intf-change", VLC_VAR_BOOL ); - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_aout, "intf-change", val ); + vlc_object_set_destructor( p_parent, aout_Destructor ); + return p_aout; } /***************************************************************************** - * aout_Delete: destroy aout structure + * aout_Destructor: destroy aout structure *****************************************************************************/ -void aout_Delete( aout_instance_t * p_aout ) +static void aout_Destructor( vlc_object_t * p_this ) { - var_Destroy( p_aout, "intf-change" ); - + 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->output_fifo_lock ); - - /* Free structure. */ - vlc_object_destroy( p_aout ); } @@ -129,12 +129,20 @@ void aout_FormatPrepare( audio_sample_format_t * p_format ) i_result = 2; break; + 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'): + i_result = 3; + break; + case VLC_FOURCC('f','l','3','2'): case VLC_FOURCC('f','i','3','2'): i_result = 4; break; case VLC_FOURCC('s','p','d','i'): + case VLC_FOURCC('s','p','d','b'): /* Big endian spdif output */ case VLC_FOURCC('a','5','2',' '): case VLC_FOURCC('d','t','s',' '): case VLC_FOURCC('m','p','g','a'): @@ -286,6 +294,11 @@ void aout_FormatsPrint( aout_instance_t * p_aout, const char * psz_text, void aout_FifoInit( aout_instance_t * p_aout, aout_fifo_t * p_fifo, uint32_t i_rate ) { + if( i_rate == 0 ) + { + msg_Err( p_aout, "initialising fifo with zero divider" ); + } + p_fifo->p_first = NULL; p_fifo->pp_last = &p_fifo->p_first; aout_DateInit( &p_fifo->end_date, i_rate ); @@ -297,6 +310,7 @@ void aout_FifoInit( aout_instance_t * p_aout, aout_fifo_t * p_fifo, void aout_FifoPush( aout_instance_t * p_aout, aout_fifo_t * p_fifo, aout_buffer_t * p_buffer ) { + (void)p_aout; *p_fifo->pp_last = p_buffer; p_fifo->pp_last = &p_buffer->p_next; *p_fifo->pp_last = NULL; @@ -321,6 +335,7 @@ void aout_FifoSet( aout_instance_t * p_aout, aout_fifo_t * p_fifo, mtime_t date ) { aout_buffer_t * p_buffer; + (void)p_aout; aout_DateSet( &p_fifo->end_date, date ); p_buffer = p_fifo->p_first; @@ -341,6 +356,7 @@ void aout_FifoMoveDates( aout_instance_t * p_aout, aout_fifo_t * p_fifo, mtime_t difference ) { aout_buffer_t * p_buffer; + (void)p_aout; aout_DateMove( &p_fifo->end_date, difference ); p_buffer = p_fifo->p_first; @@ -357,6 +373,7 @@ void aout_FifoMoveDates( aout_instance_t * p_aout, aout_fifo_t * p_fifo, *****************************************************************************/ mtime_t aout_FifoNextStart( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) { + (void)p_aout; return aout_DateGet( &p_fifo->end_date ); } @@ -366,6 +383,7 @@ mtime_t aout_FifoNextStart( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) *****************************************************************************/ mtime_t aout_FifoFirstDate( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) { + (void)p_aout; return p_fifo->p_first ? p_fifo->p_first->start_date : 0; } @@ -375,6 +393,7 @@ mtime_t aout_FifoFirstDate( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) { aout_buffer_t * p_buffer; + (void)p_aout; p_buffer = p_fifo->p_first; if ( p_buffer == NULL ) return NULL; @@ -393,6 +412,7 @@ aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) void aout_FifoDestroy( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) { aout_buffer_t * p_buffer; + (void)p_aout; p_buffer = p_fifo->p_first; while ( p_buffer != NULL ) @@ -401,6 +421,9 @@ void aout_FifoDestroy( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) aout_BufferFree( p_buffer ); p_buffer = p_next; } + + p_fifo->p_first = NULL; + p_fifo->pp_last = &p_fifo->p_first; } @@ -461,3 +484,105 @@ mtime_t aout_DateIncrement( audio_date_t * p_date, uint32_t i_nb_samples ) return p_date->date; } +/***************************************************************************** + * aout_CheckChannelReorder : Check if we need to do some channel re-ordering + *****************************************************************************/ +int aout_CheckChannelReorder( const uint32_t *pi_chan_order_in, + const uint32_t *pi_chan_order_out, + uint32_t i_channel_mask, + int i_channels, int *pi_chan_table ) +{ + bool b_chan_reorder = false; + int i, j, k, l; + + if( i_channels > AOUT_CHAN_MAX ) return false; + + for( i = 0, j = 0; pi_chan_order_in[i]; i++ ) + { + if( !(i_channel_mask & pi_chan_order_in[i]) ) continue; + + for( k = 0, l = 0; pi_chan_order_in[i] != pi_chan_order_out[k]; k++ ) + { + if( i_channel_mask & pi_chan_order_out[k] ) l++; + } + + pi_chan_table[j++] = l; + } + + for( i = 0; i < i_channels; i++ ) + { + if( pi_chan_table[i] != i ) b_chan_reorder = true; + } + + return b_chan_reorder; +} + +/***************************************************************************** + * aout_ChannelReorder : + *****************************************************************************/ +void aout_ChannelReorder( uint8_t *p_buf, int i_buffer, + int i_channels, const int *pi_chan_table, + int i_bits_per_sample ) +{ + uint8_t p_tmp[AOUT_CHAN_MAX * 4]; + int i, j; + + if( i_bits_per_sample == 8 ) + { + for( i = 0; i < i_buffer / i_channels; i++ ) + { + for( j = 0; j < i_channels; j++ ) + { + p_tmp[pi_chan_table[j]] = p_buf[j]; + } + + memcpy( p_buf, p_tmp, i_channels ); + p_buf += i_channels; + } + } + else if( i_bits_per_sample == 16 ) + { + for( i = 0; i < i_buffer / i_channels / 2; i++ ) + { + for( j = 0; j < i_channels; j++ ) + { + p_tmp[2 * pi_chan_table[j]] = p_buf[2 * j]; + p_tmp[2 * pi_chan_table[j] + 1] = p_buf[2 * j + 1]; + } + + memcpy( p_buf, p_tmp, 2 * i_channels ); + p_buf += 2 * i_channels; + } + } + else if( i_bits_per_sample == 24 ) + { + for( i = 0; i < i_buffer / i_channels / 3; i++ ) + { + for( j = 0; j < i_channels; j++ ) + { + p_tmp[3 * pi_chan_table[j]] = p_buf[3 * j]; + p_tmp[3 * pi_chan_table[j] + 1] = p_buf[3 * j + 1]; + p_tmp[3 * pi_chan_table[j] + 2] = p_buf[3 * j + 2]; + } + + memcpy( p_buf, p_tmp, 3 * i_channels ); + p_buf += 3 * i_channels; + } + } + else if( i_bits_per_sample == 32 ) + { + for( i = 0; i < i_buffer / i_channels / 4; i++ ) + { + for( j = 0; j < i_channels; j++ ) + { + p_tmp[4 * pi_chan_table[j]] = p_buf[4 * j]; + p_tmp[4 * pi_chan_table[j] + 1] = p_buf[4 * j + 1]; + p_tmp[4 * pi_chan_table[j] + 2] = p_buf[4 * j + 2]; + p_tmp[4 * pi_chan_table[j] + 3] = p_buf[4 * j + 3]; + } + + memcpy( p_buf, p_tmp, 4 * i_channels ); + p_buf += 4 * i_channels; + } + } +}