diff options
| author | melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-29 04:20:29 +0000 |
|---|---|---|
| committer | melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-29 04:20:29 +0000 |
| commit | 52668414f9adef6cac8301a85bca172a77f78228 (patch) | |
| tree | f5d33426a9d6950c8fe6af4487a66a3a4a10b0b7 /adpcm.h | |
| parent | fa669fa2ee90acaf38fc2febef9ffeb19c4f48f0 (diff) | |
| download | mpv-52668414f9adef6cac8301a85bca172a77f78228.tar.bz2 mpv-52668414f9adef6cac8301a85bca172a77f78228.tar.xz | |
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
default handler for MS ADPCM data
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3876 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'adpcm.h')
| -rw-r--r-- | adpcm.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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); |