* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <stdint.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
/**
- * @file libavcodec/ws-snd1.c
+ * @file
* Westwood SNDx codecs.
*
* Reference documents about VQA format and its audio codecs
* http://www.multimedia.cx
*/
-static const char ws_adpcm_2bit[] = { -2, -1, 0, 1};
-static const char ws_adpcm_4bit[] = {
+static const int8_t ws_adpcm_2bit[] = { -2, -1, 0, 1};
+static const int8_t ws_adpcm_4bit[] = {
-9, -8, -6, -5, -4, -3, -2, -1,
0, 1, 2, 3, 4, 5, 6, 8 };
{
// WSSNDContext *c = avctx->priv_data;
- avctx->sample_fmt = SAMPLE_FMT_S16;
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
return 0;
}
static int ws_snd_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- const uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
// WSSNDContext *c = avctx->priv_data;
int in_size, out_size;
break;
case 2: /* no compression */
if (count & 0x20) { /* big delta */
- char t;
+ int8_t t;
t = count;
t <<= 3;
sample += t >> 3;
AVCodec ws_snd1_decoder = {
"ws_snd1",
- CODEC_TYPE_AUDIO,
+ AVMEDIA_TYPE_AUDIO,
CODEC_ID_WESTWOOD_SND1,
0,
ws_snd_decode_init,