From 3f1a4f0f88cae8707f5c3b228d6313fa214d5cfb Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Thu, 30 Sep 2004 16:49:26 +0000 Subject: [PATCH] * modules/demux/wav.c: use aout_ChannelReorder(). * modules/audio_filter/channel_mixer/simple.c: remove debug message. --- modules/audio_filter/channel_mixer/simple.c | 2 - modules/demux/wav.c | 134 ++++---------------- 2 files changed, 26 insertions(+), 110 deletions(-) diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c index 1b0cdf1fee..1d182df353 100644 --- a/modules/audio_filter/channel_mixer/simple.c +++ b/modules/audio_filter/channel_mixer/simple.c @@ -66,8 +66,6 @@ static int Create( vlc_object_t *p_this ) return -1; } - msg_Err( p_this, aout_FormatPrintChannels( &p_filter->input ) ); - /* Only conversion to Stereo right now */ if( p_filter->output.i_physical_channels != (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) ) return -1; diff --git a/modules/demux/wav.c b/modules/demux/wav.c index 10eb561238..8b2c86d62c 100644 --- a/modules/demux/wav.c +++ b/modules/demux/wav.c @@ -32,8 +32,6 @@ #include -#define MAX_CHANNELS 6 - /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -67,7 +65,7 @@ struct demux_sys_t uint32_t i_channel_mask; vlc_bool_t b_chan_reorder; /* do we need channel reordering */ - int pi_chan_table[MAX_CHANNELS]; + int pi_chan_table[AOUT_CHAN_MAX]; }; #define __EVEN( x ) ( ( (x)%2 != 0 ) ? ((x)+1) : (x) ) @@ -78,22 +76,18 @@ static void FrameInfo_IMA_ADPCM( demux_t *, unsigned int *, int * ); static void FrameInfo_MS_ADPCM ( demux_t *, unsigned int *, int * ); static void FrameInfo_PCM ( demux_t *, unsigned int *, int * ); -static const uint32_t pi_channels_in[] = +static const uint32_t pi_channels_src[] = { WAVE_SPEAKER_FRONT_LEFT, WAVE_SPEAKER_FRONT_RIGHT, WAVE_SPEAKER_FRONT_CENTER, WAVE_SPEAKER_LOW_FREQUENCY, - WAVE_SPEAKER_BACK_LEFT, WAVE_SPEAKER_BACK_RIGHT }; -static const uint32_t pi_channels_out[] = + WAVE_SPEAKER_BACK_LEFT, WAVE_SPEAKER_BACK_RIGHT, 0 }; +static const uint32_t pi_channels_in[] = { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_CENTER, AOUT_CHAN_LFE, - AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT }; -static const uint32_t pi_channels_ordered[] = + AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, 0 }; +static const uint32_t pi_channels_out[] = { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, - AOUT_CHAN_CENTER, AOUT_CHAN_LFE }; - -static void CheckReordering( demux_t *, int ); -static void InterleaveS16( int16_t *, int, int *, int ); -static void InterleaveFloat32( float *, int, int *, int ); + AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 }; /***************************************************************************** * Open: check file and initializes structures @@ -180,13 +174,23 @@ static int Open( vlc_object_t * p_this ) i_channel_mask = GetDWLE( &p_wf_ext->dwChannelMask ); if( i_channel_mask ) { - for( i = 0; i < sizeof(pi_channels_in)/sizeof(uint32_t); i++ ) + for( i = 0; i < sizeof(pi_channels_src)/sizeof(uint32_t); i++ ) { - if( i_channel_mask & pi_channels_in[i] ) - p_sys->i_channel_mask |= pi_channels_out[i]; + if( i_channel_mask & pi_channels_src[i] ) + p_sys->i_channel_mask |= pi_channels_in[i]; } - msg_Dbg( p_demux, "channel mask: %x", p_sys->i_channel_mask ); - CheckReordering( p_demux, p_sys->fmt.audio.i_channels ); + + if( p_sys->fmt.i_codec == VLC_FOURCC('a','r','a','w') || + p_sys->fmt.i_codec == VLC_FOURCC('a','f','l','t') ) + + p_sys->b_chan_reorder = + aout_CheckChannelReorder( pi_channels_in, pi_channels_out, + p_sys->i_channel_mask, + p_sys->fmt.audio.i_channels, + p_sys->pi_chan_table ); + + msg_Dbg( p_demux, "channel mask: %x, reordering: %i", + p_sys->i_channel_mask, (int)p_sys->b_chan_reorder ); } p_sys->fmt.audio.i_physical_channels = p_sys->fmt.audio.i_original_channels = @@ -306,18 +310,10 @@ static int Demux( demux_t *p_demux ) /* Do the channel reordering */ if( p_sys->b_chan_reorder ) - { - if( p_sys->fmt.i_codec == VLC_FOURCC('a','r','a','w') && - p_sys->fmt.audio.i_bitspersample == 16 ) - InterleaveS16( (int16_t *)p_block->p_buffer, - p_block->i_buffer, p_sys->pi_chan_table, - p_sys->fmt.audio.i_channels ); - else if( p_sys->fmt.i_codec == VLC_FOURCC('a','f','l','t') && - p_sys->fmt.audio.i_bitspersample == 32 ) - InterleaveFloat32( (float *)p_block->p_buffer, - p_block->i_buffer, p_sys->pi_chan_table, - p_sys->fmt.audio.i_channels ); - } + aout_ChannelReorder( p_block->p_buffer, p_block->i_buffer, + p_sys->fmt.audio.i_channels, + p_sys->pi_chan_table, + p_sys->fmt.audio.i_bitspersample ); es_out_Send( p_demux->out, p_sys->p_es, p_block ); @@ -436,81 +432,3 @@ static void FrameInfo_IMA_ADPCM( demux_t *p_demux, unsigned int *pi_size, *pi_size = p_sys->fmt.audio.i_blockalign; } - -/***************************************************************************** - * CheckReordering: Check if we need to do some channel re-ordering - * (our channel order is different from the one chosen by Microsoft). - *****************************************************************************/ -static void CheckReordering( demux_t *p_demux, int i_nb_channels ) -{ - demux_sys_t *p_sys = p_demux->p_sys; - int i, j, k, l; - - p_sys->b_chan_reorder = VLC_FALSE; - - for( i = 0, j = 0; - i < (int)(sizeof(pi_channels_out)/sizeof(uint32_t)); i++ ) - { - if( p_sys->i_channel_mask & pi_channels_out[i] ) - { - for( k = 0, l = 0; - pi_channels_out[i] != pi_channels_ordered[k]; k++ ) - { - if( p_sys->i_channel_mask & pi_channels_ordered[k] ) - { - l++; - } - } - - p_sys->pi_chan_table[j] = l; - - j++; - } - } - - for( i = 0; i < i_nb_channels; i++ ) - { - if( p_sys->pi_chan_table[i] != i ) p_sys->b_chan_reorder = VLC_TRUE; - } - - if( p_sys->b_chan_reorder ) msg_Dbg( p_demux, "channel reordering needed"); -} - -/***************************************************************************** - * InterleaveFloat32/S16: change the channel order to the Microsoft one. - *****************************************************************************/ -static void InterleaveFloat32( float *p_buf, int i_buf, int *pi_chan_table, - int i_nb_channels ) -{ - int i, j; - float p_tmp[MAX_CHANNELS]; - - for( i = 0; i < i_buf / i_nb_channels / sizeof(float); i++ ) - { - for( j = 0; j < i_nb_channels; j++ ) - { - p_tmp[pi_chan_table[j]] = p_buf[i*i_nb_channels + j]; - } - - memcpy( &p_buf[i*i_nb_channels], p_tmp, - i_nb_channels * sizeof(float) ); - } -} - -static void InterleaveS16( int16_t *p_buf, int i_buf, int *pi_chan_table, - int i_nb_channels ) -{ - int i, j; - int16_t p_tmp[MAX_CHANNELS]; - - for( i = 0; i < i_buf / i_nb_channels / sizeof(int16_t); i++ ) - { - for( j = 0; j < i_nb_channels; j++ ) - { - p_tmp[pi_chan_table[j]] = p_buf[i*i_nb_channels + j]; - } - - memcpy( &p_buf[i*i_nb_channels], p_tmp, - i_nb_channels * sizeof(int16_t) ); - } -} -- 2.39.2