/*****************************************************************************
* wav.c : wav file input module for vlc
*****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
+ * Copyright (C) 2001-2003 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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.
*****************************************************************************/
/*****************************************************************************
#include <codecs.h>
-#define MAX_CHANNELS 6
-
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("WAV demuxer") );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_DEMUX );
set_capability( "demux2", 142 );
set_callbacks( Open, Close );
vlc_module_end();
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) )
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,
+ WAVE_SPEAKER_SIDE_LEFT, WAVE_SPEAKER_SIDE_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,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, 0 };
+static const uint32_t pi_channels_out[] =
{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
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
WAVEFORMATEX *p_wf;
/* Is it a wav file ? */
- if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 )
- {
- msg_Warn( p_demux, "WAV module discarded (cannot peek)" );
- return VLC_EGENERIC;
- }
- if( strncmp( p_peek, "RIFF", 4 ) || strncmp( &p_peek[8], "WAVE", 4 ) )
+ if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 ) return VLC_EGENERIC;
+
+ if( memcmp( p_peek, "RIFF", 4 ) || memcmp( &p_peek[8], "WAVE", 4 ) )
{
return VLC_EGENERIC;
}
i_extended = 0;
/* Handle new WAVE_FORMAT_EXTENSIBLE wav files */
+ /* see the following link for more information:
+ * http://www.microsoft.com/whdc/device/audio/multichaud.mspx#EFAA */
if( GetWLE( &p_wf->wFormatTag ) == WAVE_FORMAT_EXTENSIBLE &&
i_size >= sizeof( WAVEFORMATEXTENSIBLE ) )
{
- int i, i_channel_mask;
+ unsigned i, i_channel_mask;
+ GUID guid_subformat;
+
+ guid_subformat = p_wf_ext->SubFormat;
+ guid_subformat.Data1 = GetDWLE( &p_wf_ext->SubFormat.Data1 );
+ guid_subformat.Data2 = GetWLE( &p_wf_ext->SubFormat.Data2 );
+ guid_subformat.Data3 = GetWLE( &p_wf_ext->SubFormat.Data3 );
+
+ sf_tag_to_fourcc( &guid_subformat, &p_sys->fmt.i_codec, &psz_name );
- wf_tag_to_fourcc( GetWLE( &p_wf_ext->SubFormat ),
- &p_sys->fmt.i_codec, &psz_name );
i_extended = sizeof( WAVEFORMATEXTENSIBLE ) - sizeof( WAVEFORMATEX );
p_sys->fmt.i_extra -= i_extended;
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('p','c','m',' ') ||
+ 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 =
case VLC_FOURCC( 'a', 'f', 'l', 't' ):
case VLC_FOURCC( 'u', 'l', 'a', 'w' ):
case VLC_FOURCC( 'a', 'l', 'a', 'w' ):
+ case VLC_FOURCC( 'm', 'l', 'a', 'w' ):
+ case VLC_FOURCC( 'p', 'c', 'm', ' ' ):
FrameInfo_PCM( p_demux, &p_sys->i_frame_size,
&p_sys->i_frame_samples );
break;
/* 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 );
i_size = GetDWLE( p_peek + 4 );
- msg_Dbg( p_demux, "Chunk: fcc=`%4.4s` size=%d", p_peek, i_size );
+ msg_Dbg( p_demux, "chunk: fcc=`%4.4s` size=%d", p_peek, i_size );
- if( !strncmp( p_peek, fcc, 4 ) )
+ if( !memcmp( p_peek, fcc, 4 ) )
{
if( 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) );
- }
-}
projects / vlc / blobdiff