Mercurial > mplayer.hg
diff adpcm.h @ 4854:4a6dde59834c
fixed, strengthened, rewrote, and renamed a variety of the ADPCM decoders
(including MS, DK4 and DK3 ADPCM)
author | melanson |
---|---|
date | Mon, 25 Feb 2002 02:48:37 +0000 |
parents | ae6f97724b84 |
children | f9cd6381e327 |
line wrap: on
line diff
--- a/adpcm.h Mon Feb 25 02:05:30 2002 +0000 +++ b/adpcm.h Mon Feb 25 02:48:37 2002 +0000 @@ -10,21 +10,22 @@ #define MS_ADPCM_SAMPLES_PER_BLOCK \ ((sh_audio->wf->nBlockAlign - MS_ADPCM_PREAMBLE_SIZE) * 2) -#define FOX61_ADPCM_PREAMBLE_SIZE 4 -#define FOX61_ADPCM_BLOCK_SIZE 0x200 -#define FOX61_ADPCM_SAMPLES_PER_BLOCK \ - (((FOX61_ADPCM_BLOCK_SIZE - FOX61_ADPCM_PREAMBLE_SIZE) * 2) + 1) +#define DK4_ADPCM_PREAMBLE_SIZE 4 +#define DK4_ADPCM_SAMPLES_PER_BLOCK \ + (((sh_audio->wf->nBlockAlign - DK4_ADPCM_PREAMBLE_SIZE) * 2) + 1) // pretend there's such a thing as mono for this format -#define FOX62_ADPCM_PREAMBLE_SIZE 8 -#define FOX62_ADPCM_BLOCK_SIZE 0x400 +#define DK3_ADPCM_PREAMBLE_SIZE 8 +#define DK3_ADPCM_BLOCK_SIZE 0x400 // this isn't exact -#define FOX62_ADPCM_SAMPLES_PER_BLOCK 6000 +#define DK3_ADPCM_SAMPLES_PER_BLOCK 6000 int ima_adpcm_decode_block(unsigned short *output, unsigned char *input, int channels); int ms_adpcm_decode_block(unsigned short *output, unsigned char *input, int channels, int block_size); -int fox61_adpcm_decode_block(unsigned short *output, unsigned char *input); -int fox62_adpcm_decode_block(unsigned short *output, unsigned char *input); +int dk4_adpcm_decode_block(unsigned short *output, unsigned char *input, + int channels, int block_size); +int dk3_adpcm_decode_block(unsigned short *output, unsigned char *input); + #endif