implemented open source MS ADPCM decoder

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

1 files changed, 6 insertions, 23 deletions

diff --git a/adpcm.h b/adpcm.h
index c8b23d2264..48c0116ae8 100644
--- a/adpcm.h
+++ b/adpcm.h
@@ -4,29 +4,12 @@
 #define IMA_ADPCM_BLOCK_SIZE 0x22
 #define IMA_ADPCM_SAMPLES_PER_BLOCK 0x40
 
-static int adpcm_step[89] =
-{
-  7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
-  19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
-  50, 55, 60, 66, 73, 80, 88, 97, 107, 118,
-  130, 143, 157, 173, 190, 209, 230, 253, 279, 307,
-  337, 371, 408, 449, 494, 544, 598, 658, 724, 796,
-  876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066,
-  2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358,
-  5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899,
-  15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
-};
+#define MS_ADPCM_BLOCK_SIZE 256
+#define MS_ADPCM_SAMPLES_PER_BLOCK ((256 - 7) * 2)
 
-static int adpcm_index[16] =
-{
-  -1, -1, -1, -1, 2, 4, 6, 8,
-  -1, -1, -1, -1, 2, 4, 6, 8
-};
-
-static int format_0x62_table[16] =
-{
-  1, 3, 5, 7, 9, 11, 13, 15,
-  -1, -3, -5, -7, -9, -11, -13, -15
-};
+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);
 
 #endif