Mercurial > mplayer.hg

diff adpcm.h @ 3875:e3caff2daa98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the default handler for MS ADPCM data
author melanson
date Sat, 29 Dec 2001 04:20:29 +0000
parents 8a88ed2473aa
children 60db4273246d
line wrap: on
line diff
--- a/adpcm.h	Sat Dec 29 01:32:46 2001 +0000
+++ b/adpcm.h	Sat Dec 29 04:20:29 2001 +0000
@@ -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);