Mercurial > mplayer.hg
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 |
rev | line source |
---|---|
5408 | 1 /* |
2 IMA ADPCM Decoder for MPlayer | |
3 by Mike Melanson | |
4 | |
5 This file is in charge of decoding all of the various IMA ADPCM data | |
6 formats that various entities have created. Details about the data | |
7 formats can be found here: | |
8 http://www.pcisys.net/~melanson/codecs/ | |
9 | |
10 So far, this file handles these formats: | |
11 'ima4': IMA ADPCM found in QT files | |
12 0x11: IMA ADPCM found in MS AVI/ASF/WAV files | |
13 0x61: DK4 ADPCM found in certain AVI files on Sega Saturn CD-ROMs; | |
14 note that this is a 'rogue' format number in that it was | |
15 never officially registered with Microsoft | |
8103 | 16 0x1100736d: IMA ADPCM coded like in MS AVI/ASF/WAV found in QT files |
5408 | 17 */ |
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 | 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 | 28 #define MS_IMA_ADPCM_PREAMBLE_SIZE 4 |
29 | |
30 #define QT_IMA_ADPCM_PREAMBLE_SIZE 2 | |
31 #define QT_IMA_ADPCM_BLOCK_SIZE 0x22 | |
32 #define QT_IMA_ADPCM_SAMPLES_PER_BLOCK 64 | |
33 | |
34 #define BE_16(x) (be2me_16(*(unsigned short *)(x))) | |
35 #define BE_32(x) (be2me_32(*(unsigned int *)(x))) | |
36 #define LE_16(x) (le2me_16(*(unsigned short *)(x))) | |
37 #define LE_32(x) (le2me_32(*(unsigned int *)(x))) | |
38 | |
39 // pertinent tables for IMA ADPCM | |
27115 | 40 static const int adpcm_step[89] = |
5408 | 41 { |
42 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, | |
43 19, 21, 23, 25, 28, 31, 34, 37, 41, 45, | |
44 50, 55, 60, 66, 73, 80, 88, 97, 107, 118, | |
45 130, 143, 157, 173, 190, 209, 230, 253, 279, 307, | |
46 337, 371, 408, 449, 494, 544, 598, 658, 724, 796, | |
47 876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066, | |
48 2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358, | |
49 5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, | |
50 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767 | |
51 }; | |
52 | |
27115 | 53 static const int adpcm_index[16] = |
5408 | 54 { |
55 -1, -1, -1, -1, 2, 4, 6, 8, | |
56 -1, -1, -1, -1, 2, 4, 6, 8 | |
57 }; | |
58 | |
59 // useful macros | |
60 // clamp a number between 0 and 88 | |
61 #define CLAMP_0_TO_88(x) if (x < 0) x = 0; else if (x > 88) x = 88; | |
62 // clamp a number within a signed 16-bit range | |
63 #define CLAMP_S16(x) if (x < -32768) x = -32768; \ | |
64 else if (x > 32767) x = 32767; | |
65 // clamp a number above 16 | |
66 #define CLAMP_ABOVE_16(x) if (x < 16) x = 16; | |
67 // sign extend a 16-bit value | |
68 #define SE_16BIT(x) if (x & 0x8000) x -= 0x10000; | |
69 // sign extend a 4-bit value | |
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 | 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 | 83 static int preinit(sh_audio_t *sh_audio) |
84 { | |
85 // not exactly sure what this field is for | |
86 sh_audio->audio_out_minsize = 8192; | |
87 | |
88 // if format is "ima4", assume the audio is coming from a QT file which | |
89 // indicates constant block size, whereas an AVI/ASF/WAV file will fill | |
90 // in this field with 0x11 | |
8103 | 91 if ((sh_audio->format == 0x11) || (sh_audio->format == 0x61) || |
92 (sh_audio->format == 0x1100736d)) | |
5408 | 93 { |
94 sh_audio->ds->ss_div = (sh_audio->wf->nBlockAlign - | |
95 (MS_IMA_ADPCM_PREAMBLE_SIZE * sh_audio->wf->nChannels)) * 2; | |
96 sh_audio->ds->ss_mul = sh_audio->wf->nBlockAlign; | |
97 } | |
98 else | |
99 { | |
100 sh_audio->ds->ss_div = QT_IMA_ADPCM_SAMPLES_PER_BLOCK; | |
101 sh_audio->ds->ss_mul = QT_IMA_ADPCM_BLOCK_SIZE * sh_audio->wf->nChannels; | |
102 } | |
5458 | 103 sh_audio->audio_in_minsize=sh_audio->ds->ss_mul; |
5408 | 104 return 1; |
105 } | |
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 | 113 sh_audio->i_bps = |
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 | 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 | 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 | 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 | 126 if(cmd==ADCTRL_SKIP_FRAME){ |
127 demux_read_data(sh_audio->ds, sh_audio->a_in_buffer,sh_audio->ds->ss_mul); | |
128 return CONTROL_TRUE; | |
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 | 133 static void decode_nibbles(unsigned short *output, |
134 int output_size, int channels, | |
135 int predictor_l, int index_l, | |
136 int predictor_r, int index_r) | |
137 { | |
138 int step[2]; | |
139 int predictor[2]; | |
140 int index[2]; | |
141 int diff; | |
142 int i; | |
143 int sign; | |
144 int delta; | |
145 int channel_number = 0; | |
146 | |
147 step[0] = adpcm_step[index_l]; | |
148 step[1] = adpcm_step[index_r]; | |
149 predictor[0] = predictor_l; | |
150 predictor[1] = predictor_r; | |
151 index[0] = index_l; | |
152 index[1] = index_r; | |
153 | |
154 for (i = 0; i < output_size; i++) | |
155 { | |
156 delta = output[i]; | |
157 | |
158 index[channel_number] += adpcm_index[delta]; | |
159 CLAMP_0_TO_88(index[channel_number]); | |
160 | |
161 sign = delta & 8; | |
162 delta = delta & 7; | |
163 | |
164 diff = step[channel_number] >> 3; | |
165 if (delta & 4) diff += step[channel_number]; | |
166 if (delta & 2) diff += step[channel_number] >> 1; | |
167 if (delta & 1) diff += step[channel_number] >> 2; | |
168 | |
169 if (sign) | |
170 predictor[channel_number] -= diff; | |
171 else | |
172 predictor[channel_number] += diff; | |
173 | |
174 CLAMP_S16(predictor[channel_number]); | |
175 output[i] = predictor[channel_number]; | |
176 step[channel_number] = adpcm_step[index[channel_number]]; | |
177 | |
178 // toggle channel | |
179 channel_number ^= channels - 1; | |
180 | |
181 } | |
182 } | |
183 | |
184 static int qt_ima_adpcm_decode_block(unsigned short *output, | |
27112 | 185 unsigned char *input, int channels, int block_size) |
5408 | 186 { |
27114 | 187 int initial_predictor[2]; |
188 int initial_index[2]; | |
5408 | 189 int i; |
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 | 195 for (i = 0; i < channels; i++) { |
196 initial_index[i] = initial_predictor[i] = BE_16(&input[i * QT_IMA_ADPCM_BLOCK_SIZE]); | |
5408 | 197 |
198 // mask, sign-extend, and clamp the predictor portion | |
27114 | 199 initial_predictor[i] &= 0xFF80; |
200 SE_16BIT(initial_predictor[i]); | |
201 CLAMP_S16(initial_predictor[i]); | |
5408 | 202 |
203 // mask and clamp the index portion | |
27114 | 204 initial_index[i] &= 0x7F; |
205 CLAMP_0_TO_88(initial_index[i]); | |
5408 | 206 } |
207 | |
208 // break apart all of the nibbles in the block | |
209 if (channels == 1) | |
210 for (i = 0; i < QT_IMA_ADPCM_SAMPLES_PER_BLOCK / 2; i++) | |
211 { | |
212 output[i * 2 + 0] = input[2 + i] & 0x0F; | |
213 output[i * 2 + 1] = input[2 + i] >> 4; | |
214 } | |
215 else | |
15786 | 216 for (i = 0; i < QT_IMA_ADPCM_SAMPLES_PER_BLOCK / 2; i++) |
5408 | 217 { |
218 output[i * 4 + 0] = input[2 + i] & 0x0F; | |
219 output[i * 4 + 1] = input[2 + QT_IMA_ADPCM_BLOCK_SIZE + i] & 0x0F; | |
220 output[i * 4 + 2] = input[2 + i] >> 4; | |
221 output[i * 4 + 3] = input[2 + QT_IMA_ADPCM_BLOCK_SIZE + i] >> 4; | |
222 } | |
223 | |
224 decode_nibbles(output, | |
225 QT_IMA_ADPCM_SAMPLES_PER_BLOCK * channels, channels, | |
27114 | 226 initial_predictor[0], initial_index[0], |
227 initial_predictor[1], initial_index[1]); | |
5408 | 228 |
229 return QT_IMA_ADPCM_SAMPLES_PER_BLOCK * channels; | |
230 } | |
231 | |
232 static int ms_ima_adpcm_decode_block(unsigned short *output, | |
233 unsigned char *input, int channels, int block_size) | |
234 { | |
27114 | 235 int predictor[2]; |
236 int index[2]; | |
5408 | 237 int i; |
238 int channel_counter; | |
239 int channel_index; | |
240 int channel_index_l; | |
241 int channel_index_r; | |
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 | 247 for (i = 0; i < channels; i++) { |
248 predictor[i] = LE_16(&input[i * 4]); | |
249 SE_16BIT(predictor[i]); | |
250 index[i] = input[i * 4 + 2]; | |
5408 | 251 } |
252 | |
253 if (channels == 1) | |
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 | 256 { |
257 output[i * 2 + 0] = input[MS_IMA_ADPCM_PREAMBLE_SIZE + i] & 0x0F; | |
258 output[i * 2 + 1] = input[MS_IMA_ADPCM_PREAMBLE_SIZE + i] >> 4; | |
259 } | |
260 else | |
261 { | |
262 // encoded as 8 nibbles (4 bytes) per channel; switch channel every | |
263 // 4th byte | |
264 channel_counter = 0; | |
265 channel_index_l = 0; | |
266 channel_index_r = 1; | |
267 channel_index = channel_index_l; | |
268 for (i = 0; | |
269 i < (block_size - MS_IMA_ADPCM_PREAMBLE_SIZE * channels); i++) | |
270 { | |
271 output[channel_index + 0] = | |
272 input[MS_IMA_ADPCM_PREAMBLE_SIZE * 2 + i] & 0x0F; | |
273 output[channel_index + 2] = | |
274 input[MS_IMA_ADPCM_PREAMBLE_SIZE * 2 + i] >> 4; | |
275 channel_index += 4; | |
276 channel_counter++; | |
277 if (channel_counter == 4) | |
278 { | |
279 channel_index_l = channel_index; | |
280 channel_index = channel_index_r; | |
281 } | |
282 else if (channel_counter == 8) | |
283 { | |
284 channel_index_r = channel_index; | |
285 channel_index = channel_index_l; | |
286 channel_counter = 0; | |
287 } | |
288 } | |
289 } | |
290 | |
291 decode_nibbles(output, | |
292 (block_size - MS_IMA_ADPCM_PREAMBLE_SIZE * channels) * 2, | |
293 channels, | |
27114 | 294 predictor[0], index[0], |
295 predictor[1], index[1]); | |
5408 | 296 |
297 return (block_size - MS_IMA_ADPCM_PREAMBLE_SIZE * channels) * 2; | |
298 } | |
299 | |
300 static int dk4_ima_adpcm_decode_block(unsigned short *output, | |
301 unsigned char *input, int channels, int block_size) | |
302 { | |
303 int i; | |
304 int output_ptr; | |
27114 | 305 int predictor[2]; |
306 int index[2]; | |
5408 | 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 | 312 for (i = 0; i < channels; i++) { |
313 // the first predictor value goes straight to the output | |
314 predictor[i] = output[i] = LE_16(&input[i * 4]); | |
315 SE_16BIT(predictor[i]); | |
316 index[i] = input[i * 4 + 2]; | |
5408 | 317 } |
318 | |
319 output_ptr = channels; | |
320 for (i = MS_IMA_ADPCM_PREAMBLE_SIZE * channels; i < block_size; i++) | |
321 { | |
322 output[output_ptr++] = input[i] >> 4; | |
323 output[output_ptr++] = input[i] & 0x0F; | |
324 } | |
325 | |
326 decode_nibbles(&output[channels], | |
327 (block_size - MS_IMA_ADPCM_PREAMBLE_SIZE * channels) * 2 - channels, | |
328 channels, | |
27114 | 329 predictor[0], index[0], |
330 predictor[1], index[1]); | |
5408 | 331 |
332 return (block_size - MS_IMA_ADPCM_PREAMBLE_SIZE * channels) * 2 - channels; | |
333 } | |
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 | 337 int res = -1; |
338 int (*decode_func)(unsigned short *output, unsigned char *input, int channels, int block_size) = qt_ima_adpcm_decode_block; | |
5408 | 339 if (demux_read_data(sh_audio->ds, sh_audio->a_in_buffer, |
340 sh_audio->ds->ss_mul) != | |
341 sh_audio->ds->ss_mul) | |
342 return -1; | |
343 | |
8103 | 344 if ((sh_audio->format == 0x11) || (sh_audio->format == 0x1100736d)) |
27112 | 345 decode_func = ms_ima_adpcm_decode_block; |
5408 | 346 else if (sh_audio->format == 0x61) |
27112 | 347 decode_func = dk4_ima_adpcm_decode_block; |
348 | |
349 res = decode_func((unsigned short*)buf, sh_audio->a_in_buffer, | |
350 sh_audio->wf->nChannels, sh_audio->ds->ss_mul); | |
351 if (res < 0) return res; | |
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 } |