summaryrefslogtreecommitdiffstats
path: root/adpcm.h
diff options
context:
space:
mode:
Diffstat (limited to 'adpcm.h')
-rw-r--r--adpcm.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/adpcm.h b/adpcm.h
index 92ac77c73d..d20dbc5717 100644
--- a/adpcm.h
+++ b/adpcm.h
@@ -7,9 +7,8 @@
((IMA_ADPCM_BLOCK_SIZE - IMA_ADPCM_PREAMBLE_SIZE) * 2)
#define MS_ADPCM_PREAMBLE_SIZE 7
-#define MS_ADPCM_BLOCK_SIZE 256
#define MS_ADPCM_SAMPLES_PER_BLOCK \
- ((MS_ADPCM_BLOCK_SIZE - MS_ADPCM_PREAMBLE_SIZE) * 2)
+ ((sh_audio->wf->nBlockAlign - MS_ADPCM_PREAMBLE_SIZE) * 2)
// pretend there's such a thing as mono for this format
#define FOX62_ADPCM_PREAMBLE_SIZE 8
@@ -20,7 +19,7 @@
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 channels, int block_size);
int fox62_adpcm_decode_block(unsigned short *output, unsigned char *input,
int channels);