X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fwav.c;h=77c64a311f0e1fce442e4c7ea4b157ffddd5cbb6;hb=f0e55f523651aac425395919b56163a83b72d21c;hp=0bd16a77b01a2837e5af89dffa690ce3d50f9c57;hpb=fe087a38282e93addb25fa9598393e40ea233b09;p=vlc diff --git a/modules/demux/wav.c b/modules/demux/wav.c index 0bd16a77b0..77c64a311f 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 the VideoLAN team + * Copyright (C) 2001-2007 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,19 +18,17 @@ * * 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 - -#include +#include +#include +#include /***************************************************************************** * Module descriptor @@ -72,7 +70,7 @@ struct demux_sys_t #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 * ); @@ -102,17 +100,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 ) 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; @@ -142,6 +143,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, @@ -191,6 +195,7 @@ 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 = @@ -215,7 +220,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 +228,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 +236,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 +258,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 ); @@ -281,7 +289,7 @@ static int Open( vlc_object_t * p_this ) return VLC_SUCCESS; error: -relay: + free( p_wf ); free( p_sys ); return VLC_EGENERIC; } @@ -363,9 +371,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( ;; ) { @@ -379,9 +387,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 ) {