fixed, strengthened, rewrote, and renamed a variety of the ADPCM decoders

(including MS, DK4 and DK3 ADPCM)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4855 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 10 insertions, 9 deletions

diff --git a/adpcm.h b/adpcm.h
index 7ccfcb7424..9fe7c8676a 100644
--- a/adpcm.h
+++ b/adpcm.h
@@ -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