* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
- * Remi Denis-Courmont <rem # videolan.org>
+ * Rémi Denis-Courmont <rem # videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* Documentation: http://www.pcisys.net/~melanson/codecs/adpcm.txt
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/decoder.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_aout.h>
+#include <vlc_codec.h>
/*****************************************************************************
* Module descriptor
static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** );
vlc_module_begin();
- set_description( _("ADPCM audio decoder") );
+ set_description( N_("ADPCM audio decoder") );
set_capability( "decoder", 50 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACODEC );
{
enum adpcm_codec_e codec;
- int i_block;
- int i_samplesperblock;
+ size_t i_block;
+ size_t i_samplesperblock;
audio_date_t end_date;
};
static void DecodeAdpcmDk3 ( decoder_t *, int16_t *, uint8_t * );
static void DecodeAdpcmEA ( decoder_t *, int16_t *, uint8_t * );
-static int pi_channels_maps[6] =
+static const int pi_channels_maps[6] =
{
0,
AOUT_CHAN_CENTER,
};
/* Various table from http://www.pcisys.net/~melanson/codecs/adpcm.txt */
-static int i_index_table[16] =
+static const int i_index_table[16] =
{
-1, -1, -1, -1, 2, 4, 6, 8,
-1, -1, -1, -1, 2, 4, 6, 8
};
-static int i_step_table[89] =
+static const int i_step_table[89] =
{
7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
};
-static int i_adaptation_table[16] =
+static const int i_adaptation_table[16] =
{
230, 230, 230, 230, 307, 409, 512, 614,
768, 614, 512, 409, 307, 230, 230, 230
};
-static int i_adaptation_coeff1[7] =
+static const int i_adaptation_coeff1[7] =
{
256, 512, 0, 192, 240, 460, 392
};
-static int i_adaptation_coeff2[7] =
+static const int i_adaptation_coeff2[7] =
{
0, -256, 0, 64, 0, -208, -232
};
if( p_dec->fmt_in.audio.i_channels <= 0 ||
p_dec->fmt_in.audio.i_channels > 5 )
{
- msg_Err( p_dec, "bad channels count(1-5)" );
+ msg_Err( p_dec, "invalid number of channel (not between 1 and 5): %i",
+ p_dec->fmt_in.audio.i_channels );
return VLC_EGENERIC;
}
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys =
(decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
- {
- msg_Err( p_dec, "out of memory" );
return VLC_ENOMEM;
- }
switch( p_dec->fmt_in.i_codec )
{
{
p_sys->i_block = (p_sys->codec == ADPCM_IMA_QT) ?
34 * p_dec->fmt_in.audio.i_channels : 1024;
- msg_Warn( p_dec, "block size undefined, using %d", p_sys->i_block );
+ msg_Warn( p_dec, "block size undefined, using %zu", p_sys->i_block );
}
else
{
p_dec->fmt_in.audio.i_channels;
}
- msg_Dbg( p_dec, "format: samplerate:%dHz channels:%d bits/sample:%d "
- "blockalign:%d samplesperblock:%d",
+ msg_Dbg( p_dec, "format: samplerate:%d Hz channels:%d bits/sample:%d "
+ "blockalign:%zu samplesperblock:%zu",
p_dec->fmt_in.audio.i_rate, p_dec->fmt_in.audio.i_channels,
p_dec->fmt_in.audio.i_bitspersample, p_sys->i_block,
p_sys->i_samplesperblock );
{
decoder_sys_t *p_sys = p_dec->p_sys;
adpcm_ima_wav_channel_t channel[2];
- int i_nibbles;
+ size_t i_nibbles;
int b_stereo;
b_stereo = p_dec->fmt_in.audio.i_channels == 2 ? 1 : 0;