summaryrefslogtreecommitdiffstats
path: root/adpcm.h
diff options
context:
space:
mode:
authormelanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-06 01:56:27 +0000
committermelanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-06 01:56:27 +0000
commit4bbefcad28c7b3200de0d274b8506a16ad8bb00a (patch)
tree9a3f64015bfa0cef46b13fc9294d33b2db4b47a5 /adpcm.h
parent657b60c71b3339faff3f6fdf26d1c6ddc79442a8 (diff)
downloadmpv-4bbefcad28c7b3200de0d274b8506a16ad8bb00a.tar.bz2
mpv-4bbefcad28c7b3200de0d274b8506a16ad8bb00a.tar.xz
fixed format 0x62 ADPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4002 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'adpcm.h')
-rw-r--r--adpcm.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/adpcm.h b/adpcm.h
index 939f7656b6..7ccfcb7424 100644
--- a/adpcm.h
+++ b/adpcm.h
@@ -18,14 +18,13 @@
// pretend there's such a thing as mono for this format
#define FOX62_ADPCM_PREAMBLE_SIZE 8
#define FOX62_ADPCM_BLOCK_SIZE 0x400
-#define FOX62_ADPCM_SAMPLES_PER_BLOCK \
- ((FOX62_ADPCM_BLOCK_SIZE - FOX62_ADPCM_PREAMBLE_SIZE) * 2)
+// this isn't exact
+#define FOX62_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 channels);
+int fox62_adpcm_decode_block(unsigned short *output, unsigned char *input);
#endif