/*****************************************************************************
* 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 <fenrir@via.ecp.fr>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_aout.h>
#include <vlc_codecs.h>
static void Close( vlc_object_t * );
vlc_module_begin();
- set_description( _("WAV demuxer") );
+ set_description( N_("WAV demuxer") );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
- set_capability( "demux2", 142 );
+ set_capability( "demux", 142 );
set_callbacks( Open, Close );
vlc_module_end();
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];
};
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;
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;
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;
/* 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,
}
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,
p_sys->fmt.audio.i_bitspersample, p_sys->fmt.i_extra );
free( p_wf );
+ p_wf = NULL;
switch( p_sys->fmt.i_codec )
{
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 );
return VLC_SUCCESS;
error:
-relay:
+ free( p_wf );
free( p_sys );
return VLC_EGENERIC;
}
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 );
*****************************************************************************/
static int ChunkFind( demux_t *p_demux, const char *fcc, unsigned int *pi_size )
{
- uint8_t *p_peek;
+ const uint8_t *p_peek;
for( ;; )
{