annotate libmpcodecs/ad_imaadpcm.c @ 27115:cca2bdc30635

Make imaadpcm tables const
author reimar
date Sun, 29 Jun 2008 08:22:47 +0000
parents 6a0bcac0335c
children a8a6a38cd86b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
1 /*
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
2 IMA ADPCM Decoder for MPlayer
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
3 by Mike Melanson
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
4
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
5 This file is in charge of decoding all of the various IMA ADPCM data
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
6 formats that various entities have created. Details about the data
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
7 formats can be found here:
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
8 http://www.pcisys.net/~melanson/codecs/
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
9
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
10 So far, this file handles these formats:
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
11 'ima4': IMA ADPCM found in QT files
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
12 0x11: IMA ADPCM found in MS AVI/ASF/WAV files
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
13 0x61: DK4 ADPCM found in certain AVI files on Sega Saturn CD-ROMs;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
14 note that this is a 'rogue' format number in that it was
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
15 never officially registered with Microsoft
8103
d2d2e01343ca ms\0x00\x11 support
alex
parents: 7180
diff changeset
16 0x1100736d: IMA ADPCM coded like in MS AVI/ASF/WAV found in QT files
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
17 */
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
18
5340
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
19 #include <stdio.h>
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
20 #include <stdlib.h>
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
21 #include <unistd.h>
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
22
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
23 #include "config.h"
21372
1767c271d710 Remove bswap.h, use libavutil/bswap.h instead.
diego
parents: 15786
diff changeset
24 #include "libavutil/common.h"
21507
fa99b3d31d13 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
reimar
parents: 21372
diff changeset
25 #include "mpbswap.h"
5340
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
26 #include "ad_internal.h"
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
27
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
28 #define MS_IMA_ADPCM_PREAMBLE_SIZE 4
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
29
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
30 #define QT_IMA_ADPCM_PREAMBLE_SIZE 2
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
31 #define QT_IMA_ADPCM_BLOCK_SIZE 0x22
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
32 #define QT_IMA_ADPCM_SAMPLES_PER_BLOCK 64
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
33
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
34 #define BE_16(x) (be2me_16(*(unsigned short *)(x)))
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
35 #define BE_32(x) (be2me_32(*(unsigned int *)(x)))
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
36 #define LE_16(x) (le2me_16(*(unsigned short *)(x)))
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
37 #define LE_32(x) (le2me_32(*(unsigned int *)(x)))
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
38
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
39 // pertinent tables for IMA ADPCM
27115
cca2bdc30635 Make imaadpcm tables const
reimar
parents: 27114
diff changeset
40 static const int adpcm_step[89] =
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
41 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
42 7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
43 19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
44 50, 55, 60, 66, 73, 80, 88, 97, 107, 118,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
45 130, 143, 157, 173, 190, 209, 230, 253, 279, 307,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
46 337, 371, 408, 449, 494, 544, 598, 658, 724, 796,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
47 876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
48 2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
49 5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
50 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
51 };
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
52
27115
cca2bdc30635 Make imaadpcm tables const
reimar
parents: 27114
diff changeset
53 static const int adpcm_index[16] =
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
54 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
55 -1, -1, -1, -1, 2, 4, 6, 8,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
56 -1, -1, -1, -1, 2, 4, 6, 8
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
57 };
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
58
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
59 // useful macros
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
60 // clamp a number between 0 and 88
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
61 #define CLAMP_0_TO_88(x) if (x < 0) x = 0; else if (x > 88) x = 88;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
62 // clamp a number within a signed 16-bit range
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
63 #define CLAMP_S16(x) if (x < -32768) x = -32768; \
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
64 else if (x > 32767) x = 32767;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
65 // clamp a number above 16
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
66 #define CLAMP_ABOVE_16(x) if (x < 16) x = 16;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
67 // sign extend a 16-bit value
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
68 #define SE_16BIT(x) if (x & 0x8000) x -= 0x10000;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
69 // sign extend a 4-bit value
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
70 #define SE_4BIT(x) if (x & 0x8) x -= 0x10;
5340
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
71
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
72 static ad_info_t info =
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
73 {
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
74 "IMA ADPCM audio decoder",
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
75 "imaadpcm",
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
76 "Nick Kurshev",
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
77 "Mike Melanson",
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
78 ""
5340
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
79 };
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
80
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
81 LIBAD_EXTERN(imaadpcm)
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
82
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
83 static int preinit(sh_audio_t *sh_audio)
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
84 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
85 // not exactly sure what this field is for
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
86 sh_audio->audio_out_minsize = 8192;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
87
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
88 // if format is "ima4", assume the audio is coming from a QT file which
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
89 // indicates constant block size, whereas an AVI/ASF/WAV file will fill
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
90 // in this field with 0x11
8103
d2d2e01343ca ms\0x00\x11 support
alex
parents: 7180
diff changeset
91 if ((sh_audio->format == 0x11) || (sh_audio->format == 0x61) ||
d2d2e01343ca ms\0x00\x11 support
alex
parents: 7180
diff changeset
92 (sh_audio->format == 0x1100736d))
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
93 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
94 sh_audio->ds->ss_div = (sh_audio->wf->nBlockAlign -
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
95 (MS_IMA_ADPCM_PREAMBLE_SIZE * sh_audio->wf->nChannels)) * 2;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
96 sh_audio->ds->ss_mul = sh_audio->wf->nBlockAlign;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
97 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
98 else
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
99 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
100 sh_audio->ds->ss_div = QT_IMA_ADPCM_SAMPLES_PER_BLOCK;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
101 sh_audio->ds->ss_mul = QT_IMA_ADPCM_BLOCK_SIZE * sh_audio->wf->nChannels;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
102 }
5458
b3d1348b251f audio input buffer allocation/free cleanup
arpi
parents: 5408
diff changeset
103 sh_audio->audio_in_minsize=sh_audio->ds->ss_mul;
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
104 return 1;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
105 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
106
5340
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
107 static int init(sh_audio_t *sh_audio)
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
108 {
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
109 /* IMA-ADPCM 4:1 audio codec:*/
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
110 sh_audio->channels=sh_audio->wf->nChannels;
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
111 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec;
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
112 /* decodes 34 byte -> 64 short*/
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
113 sh_audio->i_bps =
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
114 (sh_audio->ds->ss_mul * sh_audio->samplerate) / sh_audio->ds->ss_div;
13427
9d0b052c4f74 setting samplesize to 2 in decoders where neccessary.
reimar
parents: 10808
diff changeset
115 sh_audio->samplesize=2;
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
116
5340
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
117 return 1;
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
118 }
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
119
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
120 static void uninit(sh_audio_t *sh_audio)
5340
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
121 {
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
122 }
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
123
5481
8ae2bf330ad5 control() done
arpi
parents: 5458
diff changeset
124 static int control(sh_audio_t *sh_audio,int cmd,void* arg, ...)
5340
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
125 {
5481
8ae2bf330ad5 control() done
arpi
parents: 5458
diff changeset
126 if(cmd==ADCTRL_SKIP_FRAME){
8ae2bf330ad5 control() done
arpi
parents: 5458
diff changeset
127 demux_read_data(sh_audio->ds, sh_audio->a_in_buffer,sh_audio->ds->ss_mul);
8ae2bf330ad5 control() done
arpi
parents: 5458
diff changeset
128 return CONTROL_TRUE;
8ae2bf330ad5 control() done
arpi
parents: 5458
diff changeset
129 }
5340
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
130 return CONTROL_UNKNOWN;
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
131 }
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
132
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
133 static void decode_nibbles(unsigned short *output,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
134 int output_size, int channels,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
135 int predictor_l, int index_l,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
136 int predictor_r, int index_r)
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
137 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
138 int step[2];
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
139 int predictor[2];
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
140 int index[2];
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
141 int diff;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
142 int i;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
143 int sign;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
144 int delta;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
145 int channel_number = 0;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
146
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
147 step[0] = adpcm_step[index_l];
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
148 step[1] = adpcm_step[index_r];
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
149 predictor[0] = predictor_l;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
150 predictor[1] = predictor_r;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
151 index[0] = index_l;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
152 index[1] = index_r;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
153
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
154 for (i = 0; i < output_size; i++)
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
155 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
156 delta = output[i];
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
157
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
158 index[channel_number] += adpcm_index[delta];
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
159 CLAMP_0_TO_88(index[channel_number]);
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
160
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
161 sign = delta & 8;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
162 delta = delta & 7;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
163
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
164 diff = step[channel_number] >> 3;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
165 if (delta & 4) diff += step[channel_number];
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
166 if (delta & 2) diff += step[channel_number] >> 1;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
167 if (delta & 1) diff += step[channel_number] >> 2;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
168
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
169 if (sign)
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
170 predictor[channel_number] -= diff;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
171 else
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
172 predictor[channel_number] += diff;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
173
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
174 CLAMP_S16(predictor[channel_number]);
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
175 output[i] = predictor[channel_number];
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
176 step[channel_number] = adpcm_step[index[channel_number]];
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
177
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
178 // toggle channel
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
179 channel_number ^= channels - 1;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
180
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
181 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
182 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
183
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
184 static int qt_ima_adpcm_decode_block(unsigned short *output,
27112
cd61e85bb657 Simplify ad_imaadpcm decode_audio function
reimar
parents: 21507
diff changeset
185 unsigned char *input, int channels, int block_size)
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
186 {
27114
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
187 int initial_predictor[2];
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
188 int initial_index[2];
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
189 int i;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
190
27113
680301b96149 Add a few size checks to IMA decoder. The code is still a mess though,
reimar
parents: 27112
diff changeset
191 if (channels > 1) channels = 2;
680301b96149 Add a few size checks to IMA decoder. The code is still a mess though,
reimar
parents: 27112
diff changeset
192 if (block_size < channels * QT_IMA_ADPCM_BLOCK_SIZE)
680301b96149 Add a few size checks to IMA decoder. The code is still a mess though,
reimar
parents: 27112
diff changeset
193 return -1;
680301b96149 Add a few size checks to IMA decoder. The code is still a mess though,
reimar
parents: 27112
diff changeset
194
27114
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
195 for (i = 0; i < channels; i++) {
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
196 initial_index[i] = initial_predictor[i] = BE_16(&input[i * QT_IMA_ADPCM_BLOCK_SIZE]);
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
197
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
198 // mask, sign-extend, and clamp the predictor portion
27114
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
199 initial_predictor[i] &= 0xFF80;
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
200 SE_16BIT(initial_predictor[i]);
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
201 CLAMP_S16(initial_predictor[i]);
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
202
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
203 // mask and clamp the index portion
27114
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
204 initial_index[i] &= 0x7F;
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
205 CLAMP_0_TO_88(initial_index[i]);
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
206 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
207
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
208 // break apart all of the nibbles in the block
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
209 if (channels == 1)
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
210 for (i = 0; i < QT_IMA_ADPCM_SAMPLES_PER_BLOCK / 2; i++)
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
211 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
212 output[i * 2 + 0] = input[2 + i] & 0x0F;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
213 output[i * 2 + 1] = input[2 + i] >> 4;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
214 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
215 else
15786
99df5428882f fix illegal read
reimar
parents: 13427
diff changeset
216 for (i = 0; i < QT_IMA_ADPCM_SAMPLES_PER_BLOCK / 2; i++)
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
217 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
218 output[i * 4 + 0] = input[2 + i] & 0x0F;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
219 output[i * 4 + 1] = input[2 + QT_IMA_ADPCM_BLOCK_SIZE + i] & 0x0F;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
220 output[i * 4 + 2] = input[2 + i] >> 4;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
221 output[i * 4 + 3] = input[2 + QT_IMA_ADPCM_BLOCK_SIZE + i] >> 4;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
222 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
223
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
224 decode_nibbles(output,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
225 QT_IMA_ADPCM_SAMPLES_PER_BLOCK * channels, channels,
27114
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
226 initial_predictor[0], initial_index[0],
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
227 initial_predictor[1], initial_index[1]);
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
228
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
229 return QT_IMA_ADPCM_SAMPLES_PER_BLOCK * channels;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
230 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
231
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
232 static int ms_ima_adpcm_decode_block(unsigned short *output,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
233 unsigned char *input, int channels, int block_size)
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
234 {
27114
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
235 int predictor[2];
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
236 int index[2];
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
237 int i;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
238 int channel_counter;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
239 int channel_index;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
240 int channel_index_l;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
241 int channel_index_r;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
242
27113
680301b96149 Add a few size checks to IMA decoder. The code is still a mess though,
reimar
parents: 27112
diff changeset
243 if (channels > 1) channels = 2;
680301b96149 Add a few size checks to IMA decoder. The code is still a mess though,
reimar
parents: 27112
diff changeset
244 if (block_size < MS_IMA_ADPCM_PREAMBLE_SIZE * channels)
680301b96149 Add a few size checks to IMA decoder. The code is still a mess though,
reimar
parents: 27112
diff changeset
245 return -1;
680301b96149 Add a few size checks to IMA decoder. The code is still a mess though,
reimar
parents: 27112
diff changeset
246
27114
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
247 for (i = 0; i < channels; i++) {
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
248 predictor[i] = LE_16(&input[i * 4]);
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
249 SE_16BIT(predictor[i]);
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
250 index[i] = input[i * 4 + 2];
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
251 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
252
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
253 if (channels == 1)
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
254 for (i = 0;
10808
9883dfced49c 100l: you have 2 nibbles per byte, don't divide byte count by 2
rtognimp
parents: 8103
diff changeset
255 i < (block_size - MS_IMA_ADPCM_PREAMBLE_SIZE * channels); i++)
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
256 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
257 output[i * 2 + 0] = input[MS_IMA_ADPCM_PREAMBLE_SIZE + i] & 0x0F;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
258 output[i * 2 + 1] = input[MS_IMA_ADPCM_PREAMBLE_SIZE + i] >> 4;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
259 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
260 else
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
261 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
262 // encoded as 8 nibbles (4 bytes) per channel; switch channel every
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
263 // 4th byte
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
264 channel_counter = 0;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
265 channel_index_l = 0;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
266 channel_index_r = 1;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
267 channel_index = channel_index_l;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
268 for (i = 0;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
269 i < (block_size - MS_IMA_ADPCM_PREAMBLE_SIZE * channels); i++)
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
270 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
271 output[channel_index + 0] =
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
272 input[MS_IMA_ADPCM_PREAMBLE_SIZE * 2 + i] & 0x0F;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
273 output[channel_index + 2] =
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
274 input[MS_IMA_ADPCM_PREAMBLE_SIZE * 2 + i] >> 4;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
275 channel_index += 4;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
276 channel_counter++;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
277 if (channel_counter == 4)
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
278 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
279 channel_index_l = channel_index;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
280 channel_index = channel_index_r;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
281 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
282 else if (channel_counter == 8)
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
283 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
284 channel_index_r = channel_index;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
285 channel_index = channel_index_l;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
286 channel_counter = 0;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
287 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
288 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
289 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
290
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
291 decode_nibbles(output,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
292 (block_size - MS_IMA_ADPCM_PREAMBLE_SIZE * channels) * 2,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
293 channels,
27114
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
294 predictor[0], index[0],
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
295 predictor[1], index[1]);
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
296
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
297 return (block_size - MS_IMA_ADPCM_PREAMBLE_SIZE * channels) * 2;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
298 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
299
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
300 static int dk4_ima_adpcm_decode_block(unsigned short *output,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
301 unsigned char *input, int channels, int block_size)
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
302 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
303 int i;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
304 int output_ptr;
27114
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
305 int predictor[2];
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
306 int index[2];
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
307
27113
680301b96149 Add a few size checks to IMA decoder. The code is still a mess though,
reimar
parents: 27112
diff changeset
308 if (channels > 1) channels = 2;
680301b96149 Add a few size checks to IMA decoder. The code is still a mess though,
reimar
parents: 27112
diff changeset
309 if (block_size < MS_IMA_ADPCM_PREAMBLE_SIZE * channels)
680301b96149 Add a few size checks to IMA decoder. The code is still a mess though,
reimar
parents: 27112
diff changeset
310 return -1;
680301b96149 Add a few size checks to IMA decoder. The code is still a mess though,
reimar
parents: 27112
diff changeset
311
27114
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
312 for (i = 0; i < channels; i++) {
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
313 // the first predictor value goes straight to the output
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
314 predictor[i] = output[i] = LE_16(&input[i * 4]);
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
315 SE_16BIT(predictor[i]);
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
316 index[i] = input[i * 4 + 2];
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
317 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
318
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
319 output_ptr = channels;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
320 for (i = MS_IMA_ADPCM_PREAMBLE_SIZE * channels; i < block_size; i++)
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
321 {
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
322 output[output_ptr++] = input[i] >> 4;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
323 output[output_ptr++] = input[i] & 0x0F;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
324 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
325
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
326 decode_nibbles(&output[channels],
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
327 (block_size - MS_IMA_ADPCM_PREAMBLE_SIZE * channels) * 2 - channels,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
328 channels,
27114
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
329 predictor[0], index[0],
6a0bcac0335c Simplify code to read index/predictor
reimar
parents: 27113
diff changeset
330 predictor[1], index[1]);
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
331
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
332 return (block_size - MS_IMA_ADPCM_PREAMBLE_SIZE * channels) * 2 - channels;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
333 }
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
334
5340
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
335 static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
336 {
27112
cd61e85bb657 Simplify ad_imaadpcm decode_audio function
reimar
parents: 21507
diff changeset
337 int res = -1;
cd61e85bb657 Simplify ad_imaadpcm decode_audio function
reimar
parents: 21507
diff changeset
338 int (*decode_func)(unsigned short *output, unsigned char *input, int channels, int block_size) = qt_ima_adpcm_decode_block;
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
339 if (demux_read_data(sh_audio->ds, sh_audio->a_in_buffer,
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
340 sh_audio->ds->ss_mul) !=
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
341 sh_audio->ds->ss_mul)
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
342 return -1;
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
343
8103
d2d2e01343ca ms\0x00\x11 support
alex
parents: 7180
diff changeset
344 if ((sh_audio->format == 0x11) || (sh_audio->format == 0x1100736d))
27112
cd61e85bb657 Simplify ad_imaadpcm decode_audio function
reimar
parents: 21507
diff changeset
345 decode_func = ms_ima_adpcm_decode_block;
5408
f9cd6381e327 reworked ADPCM decoders; changes include:
melanson
parents: 5340
diff changeset
346 else if (sh_audio->format == 0x61)
27112
cd61e85bb657 Simplify ad_imaadpcm decode_audio function
reimar
parents: 21507
diff changeset
347 decode_func = dk4_ima_adpcm_decode_block;
cd61e85bb657 Simplify ad_imaadpcm decode_audio function
reimar
parents: 21507
diff changeset
348
cd61e85bb657 Simplify ad_imaadpcm decode_audio function
reimar
parents: 21507
diff changeset
349 res = decode_func((unsigned short*)buf, sh_audio->a_in_buffer,
cd61e85bb657 Simplify ad_imaadpcm decode_audio function
reimar
parents: 21507
diff changeset
350 sh_audio->wf->nChannels, sh_audio->ds->ss_mul);
cd61e85bb657 Simplify ad_imaadpcm decode_audio function
reimar
parents: 21507
diff changeset
351 if (res < 0) return res;
cd61e85bb657 Simplify ad_imaadpcm decode_audio function
reimar
parents: 21507
diff changeset
352 else return 2 * res;
5340
0f12fb7c1c5d imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
arpi
parents:
diff changeset
353 }