X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fwav.c;h=382b553836d76aaea63ba4767df3170695ce3a6f;hb=7d1d56fec646569bd14262f6b9dde31becbe2137;hp=985df8f89222906310771e545dc63ebb07e82ee9;hpb=8b807a4e104f6f9039f37432858b64cda7e53094;p=vlc diff --git a/modules/demux/wav.c b/modules/demux/wav.c index 985df8f892..382b553836 100644 --- a/modules/demux/wav.c +++ b/modules/demux/wav.c @@ -1,7 +1,7 @@ /***************************************************************************** * wav.c : wav file input module for vlc ***************************************************************************** - * Copyright (C) 2001-2003 VideoLAN + * Copyright (C) 2001-2007 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,18 +18,22 @@ * * 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 /* malloc(), free() */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include +#include +#include +#include +#include /***************************************************************************** * Module descriptor @@ -38,8 +42,10 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); vlc_module_begin(); - set_description( _("WAV demuxer") ); - set_capability( "demux2", 142 ); + set_description( N_("WAV demuxer") ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_DEMUX ); + set_capability( "demux", 142 ); set_callbacks( Open, Close ); vlc_module_end(); @@ -61,16 +67,36 @@ struct demux_sys_t int i_frame_samples; date_t pts; + + uint32_t i_channel_mask; + bool b_chan_reorder; /* do we need channel reordering */ + int pi_chan_table[AOUT_CHAN_MAX]; }; #define __EVEN( x ) ( ( (x)%2 != 0 ) ? ((x)+1) : (x) ) -static int ChunkFind( demux_t *, char *, unsigned int * ); +static int ChunkFind( demux_t *, const char *, unsigned int * ); 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_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, + 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, + 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, 0 }; + /***************************************************************************** * Open: check file and initializes structures *****************************************************************************/ @@ -79,20 +105,17 @@ static int Open( vlc_object_t * p_this ) demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; - uint8_t *p_peek; + const uint8_t *p_peek; unsigned int i_size, i_extended; - char *psz_name; + const char *psz_name; - WAVEFORMATEXTENSIBLE *p_wf_ext; - WAVEFORMATEX *p_wf; + WAVEFORMATEXTENSIBLE *p_wf_ext = NULL; + WAVEFORMATEX *p_wf = NULL; /* 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; } @@ -100,7 +123,12 @@ static int Open( vlc_object_t * p_this ) p_demux->pf_demux = Demux; p_demux->pf_control = Control; p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); + if( p_sys == NULL ) + return VLC_ENOMEM; + p_sys->p_es = NULL; + p_sys->b_chan_reorder = 0; + p_sys->i_channel_mask = 0; /* skip riff header */ stream_Read( p_demux->s, NULL, 12 ); /* cannot fail as peek succeed */ @@ -120,6 +148,9 @@ static int Open( vlc_object_t * p_this ) /* load waveformatex */ p_wf_ext = malloc( __EVEN( i_size ) + 2 ); + if( p_wf_ext == NULL ) + goto error; + p_wf = (WAVEFORMATEX *)p_wf_ext; p_wf->cbSize = 0; if( stream_Read( p_demux->s, @@ -141,13 +172,49 @@ static int Open( vlc_object_t * p_this ) 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 ) ) { - wf_tag_to_fourcc( GetWLE( &p_wf_ext->SubFormat ), - &p_sys->fmt.i_codec, &psz_name ); + 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 ); + 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_src)/sizeof(uint32_t); i++ ) + { + if( i_channel_mask & pi_channels_src[i] ) + p_sys->i_channel_mask |= pi_channels_in[i]; + } + + 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 = + p_sys->i_channel_mask; } if( p_sys->fmt.i_extra > 0 ) @@ -158,7 +225,7 @@ static int Open( vlc_object_t * p_this ) } msg_Dbg( p_demux, "format: 0x%4.4x, fourcc: %4.4s, channels: %d, " - "freq: %d Hz, bitrate: %dKo/s, blockalign: %d, bits/samples: %d, " + "freq: %u Hz, bitrate: %uKo/s, blockalign: %d, bits/samples: %d, " "extra size: %d", GetWLE( &p_wf->wFormatTag ), (char *)&p_sys->fmt.i_codec, p_sys->fmt.audio.i_channels, p_sys->fmt.audio.i_rate, @@ -166,6 +233,7 @@ static int Open( vlc_object_t * p_this ) p_sys->fmt.audio.i_bitspersample, p_sys->fmt.i_extra ); free( p_wf ); + p_wf = NULL; switch( p_sys->fmt.i_codec ) { @@ -173,6 +241,8 @@ static int Open( vlc_object_t * p_this ) 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; @@ -193,7 +263,7 @@ static int Open( vlc_object_t * p_this ) case VLC_FOURCC( 'm', 'p', 'g', 'a' ): case VLC_FOURCC( 'a', '5', '2', ' ' ): /* FIXME set end of area FIXME */ - goto relay; + goto error; default: msg_Err( p_demux, "unsupported codec (%4.4s)", (char*)&p_sys->fmt.i_codec ); @@ -224,7 +294,7 @@ static int Open( vlc_object_t * p_this ) return VLC_SUCCESS; error: -relay: + free( p_wf ); free( p_sys ); return VLC_EGENERIC; } @@ -261,6 +331,13 @@ static int Demux( demux_t *p_demux ) /* set PCR */ es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts ); + /* Do the channel reordering */ + if( p_sys->b_chan_reorder ) + 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 ); return 1; @@ -290,7 +367,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) i_end = p_sys->i_data_pos + p_sys->i_data_size; } - return demux2_vaControlHelper( p_demux->s, p_sys->i_data_pos, i_end, + return demux_vaControlHelper( p_demux->s, p_sys->i_data_pos, i_end, p_sys->fmt.i_bitrate, p_sys->fmt.audio.i_blockalign, i_query, args ); @@ -299,9 +376,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) /***************************************************************************** * Local functions *****************************************************************************/ -static int ChunkFind( demux_t *p_demux, char *fcc, unsigned int *pi_size ) +static int ChunkFind( demux_t *p_demux, const char *fcc, unsigned int *pi_size ) { - uint8_t *p_peek; + const uint8_t *p_peek; for( ;; ) { @@ -315,9 +392,9 @@ static int ChunkFind( demux_t *p_demux, char *fcc, unsigned int *pi_size ) 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 ) {