X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fwav.c;h=cf66ce9d7e66cbfc7f7a7ba36b1349b0a2cac0dc;hb=aaddb130d42824b0f63e48059efd1c2829a30dac;hp=5db087f16ec7f9a47e2bd7c420724dcd241c3dc3;hpb=91f2877dec9e00d081facbb7b12f610a9f329357;p=vlc diff --git a/modules/demux/wav.c b/modules/demux/wav.c index 5db087f16e..cf66ce9d7e 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-2008 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,19 +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 -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include +#include +#include +#include +#include /***************************************************************************** * Module descriptor @@ -38,13 +41,13 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -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(); +vlc_module_begin () + 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 () /***************************************************************************** * Local prototypes @@ -66,33 +69,27 @@ struct demux_sys_t date_t pts; uint32_t i_channel_mask; - vlc_bool_t b_chan_reorder; /* do we need channel reordering */ + 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 void FrameInfo_MSGSM ( 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_BACK_LEFT, WAVE_SPEAKER_BACK_RIGHT, WAVE_SPEAKER_BACK_CENTER, 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_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_REARCENTER, 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 @@ -102,17 +99,18 @@ 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; - unsigned int i_size, i_extended; - char *psz_name; + const uint8_t *p_peek; + uint32_t i_size; + unsigned int i_extended; + 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 ) return VLC_EGENERIC; - if( strncmp( p_peek, "RIFF", 4 ) || strncmp( &p_peek[8], "WAVE", 4 ) ) + if( memcmp( p_peek, "RIFF", 4 ) || memcmp( &p_peek[8], "WAVE", 4 ) ) { return VLC_EGENERIC; } @@ -120,6 +118,9 @@ 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; @@ -133,7 +134,8 @@ static int Open( vlc_object_t * p_this ) msg_Err( p_demux, "cannot find 'fmt ' chunk" ); goto error; } - if( i_size < sizeof( WAVEFORMATEX ) - 2 ) /* XXX -2 isn't a typo */ + i_size += 2; + if( i_size < sizeof( WAVEFORMATEX ) ) { msg_Err( p_demux, "invalid 'fmt ' chunk" ); goto error; @@ -141,11 +143,15 @@ static int Open( vlc_object_t * p_this ) stream_Read( p_demux->s, NULL, 8 ); /* Cannot fail */ /* load waveformatex */ - p_wf_ext = malloc( __EVEN( i_size ) + 2 ); + p_wf_ext = malloc( i_size ); + if( p_wf_ext == NULL ) + goto error; + p_wf = (WAVEFORMATEX *)p_wf_ext; p_wf->cbSize = 0; - if( stream_Read( p_demux->s, - p_wf, __EVEN( i_size ) ) < (int)__EVEN( i_size ) ) + i_size -= 2; + if( stream_Read( p_demux->s, p_wf, i_size ) != (int)i_size + || ( ( i_size & 1 ) && stream_Read( p_demux->s, NULL, 1 ) != 1 ) ) { msg_Err( p_demux, "cannot load 'fmt ' chunk" ); goto error; @@ -159,16 +165,19 @@ static int Open( vlc_object_t * p_this ) p_sys->fmt.audio.i_blockalign = GetWLE( &p_wf->nBlockAlign ); p_sys->fmt.i_bitrate = GetDWLE( &p_wf->nAvgBytesPerSec ) * 8; p_sys->fmt.audio.i_bitspersample = GetWLE( &p_wf->wBitsPerSample ); - p_sys->fmt.i_extra = GetWLE( &p_wf->cbSize ); + if( i_size >= sizeof(WAVEFORMATEX) ) + p_sys->fmt.i_extra = __MIN( GetWLE( &p_wf->cbSize ), i_size - sizeof(WAVEFORMATEX) ); 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 ) ) + i_size >= sizeof( WAVEFORMATEXTENSIBLE ) && + ( p_sys->fmt.i_extra + sizeof( WAVEFORMATEX ) + >= sizeof( WAVEFORMATEXTENSIBLE ) ) ) { - int i, i_channel_mask; + unsigned i, i_channel_mask; GUID guid_subformat; guid_subformat = p_wf_ext->SubFormat; @@ -191,10 +200,11 @@ static int Open( vlc_object_t * p_this ) } 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, + aout_CheckChannelReorder( pi_channels_in, NULL, p_sys->i_channel_mask, p_sys->fmt.audio.i_channels, p_sys->pi_chan_table ); @@ -215,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, @@ -223,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 ) { @@ -230,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; @@ -250,7 +263,11 @@ 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; + case VLC_FOURCC( 'a', 'g', 's', 'm' ): + FrameInfo_MSGSM( p_demux, &p_sys->i_frame_size, + &p_sys->i_frame_samples ); + break; default: msg_Err( p_demux, "unsupported codec (%4.4s)", (char*)&p_sys->fmt.i_codec ); @@ -281,7 +298,7 @@ static int Open( vlc_object_t * p_this ) return VLC_SUCCESS; error: -relay: + free( p_wf ); free( p_sys ); return VLC_EGENERIC; } @@ -354,7 +371,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 ); @@ -363,25 +380,25 @@ 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( ;; ) { - int i_size; + uint32_t i_size; if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 ) { - msg_Err( p_demux, "cannot peek()" ); + msg_Err( p_demux, "cannot peek" ); return VLC_EGENERIC; } 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=%"PRIu32, p_peek, i_size ); - if( !strncmp( p_peek, fcc, 4 ) ) + if( !memcmp( p_peek, fcc, 4 ) ) { if( pi_size ) { @@ -390,11 +407,11 @@ static int ChunkFind( demux_t *p_demux, char *fcc, unsigned int *pi_size ) return VLC_SUCCESS; } - i_size = __EVEN( i_size ) + 8; - if( stream_Read( p_demux->s, NULL, i_size ) != i_size ) - { + /* Skip chunk */ + if( stream_Read( p_demux->s, NULL, 8 ) != 8 + || stream_Read( p_demux->s, NULL, i_size ) != i_size + || ((i_size & 1) && stream_Read( p_demux->s, NULL, 1 ) != 1 )) return VLC_EGENERIC; - } } } @@ -442,3 +459,13 @@ static void FrameInfo_IMA_ADPCM( demux_t *p_demux, unsigned int *pi_size, *pi_size = p_sys->fmt.audio.i_blockalign; } + +static void FrameInfo_MSGSM( demux_t *p_demux, unsigned int *pi_size, + int *pi_samples ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + + *pi_samples = ( p_sys->fmt.audio.i_blockalign * p_sys->fmt.audio.i_rate * 8) + / p_sys->fmt.i_bitrate; + *pi_size = p_sys->fmt.audio.i_blockalign; +}