History

cosmetics: indentation

Justin Ruggles committed 15 years ago

Commit f1d15161 parent 11587451 file · +157 −157Browse files

Unified · Split

libavcodec/mpegaudiodec.c+157−157
@@ -269,190 +269,190 @@ static inline int l3_unscale(int value, int exponent) · 268 unmodified lines
269static void decode_init_static(AVCodec *codec)269static void decode_init_static(AVCodec *codec)
270{270{
271 int i, j, k;271 int i, j, k;
272 int offset;272 int offset;
273 273
274 /* scale factors table for layer 1/2 */274 /* scale factors table for layer 1/2 */
275 for (i = 0; i < 64; i++) {275 for (i = 0; i < 64; i++) {
276 int shift, mod;276 int shift, mod;
277 /* 1.0 (i = 3) is normalized to 2 ^ FRAC_BITS */277 /* 1.0 (i = 3) is normalized to 2 ^ FRAC_BITS */
278 shift = i / 3;278 shift = i / 3;
279 mod = i % 3;279 mod = i % 3;
280 scale_factor_modshift[i] = mod | (shift << 2);280 scale_factor_modshift[i] = mod | (shift << 2);
281 }281 }
282 282
283 /* scale factor multiply for layer 1 */283 /* scale factor multiply for layer 1 */
284 for (i = 0; i < 15; i++) {284 for (i = 0; i < 15; i++) {
285 int n, norm;285 int n, norm;
286 n = i + 2;286 n = i + 2;
287 norm = ((INT64_C(1) << n) * FRAC_ONE) / ((1 << n) - 1);287 norm = ((INT64_C(1) << n) * FRAC_ONE) / ((1 << n) - 1);
288 scale_factor_mult[i][0] = MULLx(norm, FIXR(1.0 * 2.0), FRAC_BITS);288 scale_factor_mult[i][0] = MULLx(norm, FIXR(1.0 * 2.0), FRAC_BITS);
289 scale_factor_mult[i][1] = MULLx(norm, FIXR(0.7937005259 * 2.0), FRAC_BITS);289 scale_factor_mult[i][1] = MULLx(norm, FIXR(0.7937005259 * 2.0), FRAC_BITS);
290 scale_factor_mult[i][2] = MULLx(norm, FIXR(0.6299605249 * 2.0), FRAC_BITS);290 scale_factor_mult[i][2] = MULLx(norm, FIXR(0.6299605249 * 2.0), FRAC_BITS);
291 av_dlog(avctx, "%d: norm=%x s=%x %x %x\n", i, norm,291 av_dlog(avctx, "%d: norm=%x s=%x %x %x\n", i, norm,
292 scale_factor_mult[i][0],292 scale_factor_mult[i][0],
293 scale_factor_mult[i][1],293 scale_factor_mult[i][1],
294 scale_factor_mult[i][2]);294 scale_factor_mult[i][2]);
295 }295 }
296 296
297 RENAME(ff_mpa_synth_init)(RENAME(ff_mpa_synth_window));297 RENAME(ff_mpa_synth_init)(RENAME(ff_mpa_synth_window));
298 298
299 /* huffman decode tables */299 /* huffman decode tables */
300 offset = 0;300 offset = 0;
301 for (i = 1; i < 16; i++) {301 for (i = 1; i < 16; i++) {
302 const HuffTable *h = &mpa_huff_tables[i];302 const HuffTable *h = &mpa_huff_tables[i];
303 int xsize, x, y;303 int xsize, x, y;
304 uint8_t tmp_bits [512];304 uint8_t tmp_bits [512];
305 uint16_t tmp_codes[512];305 uint16_t tmp_codes[512];
306 306
307 memset(tmp_bits , 0, sizeof(tmp_bits ));307 memset(tmp_bits , 0, sizeof(tmp_bits ));
308 memset(tmp_codes, 0, sizeof(tmp_codes));308 memset(tmp_codes, 0, sizeof(tmp_codes));
309 309
310 xsize = h->xsize;310 xsize = h->xsize;
311 311
312 j = 0;312 j = 0;
313 for (x = 0; x < xsize; x++) {313 for (x = 0; x < xsize; x++) {
314 for (y = 0; y < xsize; y++) {314 for (y = 0; y < xsize; y++) {
315 tmp_bits [(x << 5) | y | ((x&&y)<<4)]= h->bits [j ];315 tmp_bits [(x << 5) | y | ((x&&y)<<4)]= h->bits [j ];
316 tmp_codes[(x << 5) | y | ((x&&y)<<4)]= h->codes[j++];316 tmp_codes[(x << 5) | y | ((x&&y)<<4)]= h->codes[j++];
317 }
318 }317 }
319
320 /* XXX: fail test */
321 huff_vlc[i].table = huff_vlc_tables+offset;
322 huff_vlc[i].table_allocated = huff_vlc_tables_sizes[i];
323 init_vlc(&huff_vlc[i], 7, 512,
324 tmp_bits, 1, 1, tmp_codes, 2, 2,
325 INIT_VLC_USE_NEW_STATIC);
326 offset += huff_vlc_tables_sizes[i];
327 }318 }
328 assert(offset == FF_ARRAY_ELEMS(huff_vlc_tables));
329
330 offset = 0;
331 for (i = 0; i < 2; i++) {
332 huff_quad_vlc[i].table = huff_quad_vlc_tables+offset;
333 huff_quad_vlc[i].table_allocated = huff_quad_vlc_tables_sizes[i];
334 init_vlc(&huff_quad_vlc[i], i == 0 ? 7 : 4, 16,
335 mpa_quad_bits[i], 1, 1, mpa_quad_codes[i], 1, 1,
336 INIT_VLC_USE_NEW_STATIC);
337 offset += huff_quad_vlc_tables_sizes[i];
338 }
339 assert(offset == FF_ARRAY_ELEMS(huff_quad_vlc_tables));
340 319
341 for (i = 0; i < 9; i++) {320 /* XXX: fail test */
342 k = 0;321 huff_vlc[i].table = huff_vlc_tables+offset;
343 for (j = 0; j < 22; j++) {322 huff_vlc[i].table_allocated = huff_vlc_tables_sizes[i];
344 band_index_long[i][j] = k;323 init_vlc(&huff_vlc[i], 7, 512,
345 k += band_size_long[i][j];324 tmp_bits, 1, 1, tmp_codes, 2, 2,
346 }325 INIT_VLC_USE_NEW_STATIC);
347 band_index_long[i][22] = k;326 offset += huff_vlc_tables_sizes[i];
327 }
328 assert(offset == FF_ARRAY_ELEMS(huff_vlc_tables));
329
330 offset = 0;
331 for (i = 0; i < 2; i++) {
332 huff_quad_vlc[i].table = huff_quad_vlc_tables+offset;
333 huff_quad_vlc[i].table_allocated = huff_quad_vlc_tables_sizes[i];
334 init_vlc(&huff_quad_vlc[i], i == 0 ? 7 : 4, 16,
335 mpa_quad_bits[i], 1, 1, mpa_quad_codes[i], 1, 1,
336 INIT_VLC_USE_NEW_STATIC);
337 offset += huff_quad_vlc_tables_sizes[i];
338 }
339 assert(offset == FF_ARRAY_ELEMS(huff_quad_vlc_tables));
340
341 for (i = 0; i < 9; i++) {
342 k = 0;
343 for (j = 0; j < 22; j++) {
344 band_index_long[i][j] = k;
345 k += band_size_long[i][j];
348 }346 }
347 band_index_long[i][22] = k;
348 }
349 349
350 /* compute n ^ (4/3) and store it in mantissa/exp format */350 /* compute n ^ (4/3) and store it in mantissa/exp format */
351 351
352 mpegaudio_tableinit();352 mpegaudio_tableinit();
353 353
354 for (i = 0; i < 4; i++) {354 for (i = 0; i < 4; i++) {
355 if (ff_mpa_quant_bits[i] < 0) {355 if (ff_mpa_quant_bits[i] < 0) {
356 for (j = 0; j < (1 << (-ff_mpa_quant_bits[i]+1)); j++) {356 for (j = 0; j < (1 << (-ff_mpa_quant_bits[i]+1)); j++) {
357 int val1, val2, val3, steps;357 int val1, val2, val3, steps;
358 int val = j;358 int val = j;
359 steps = ff_mpa_quant_steps[i];359 steps = ff_mpa_quant_steps[i];
360 val1 = val % steps;360 val1 = val % steps;
361 val /= steps;361 val /= steps;
362 val2 = val % steps;362 val2 = val % steps;
363 val3 = val / steps;363 val3 = val / steps;
364 division_tabs[i][j] = val1 + (val2 << 4) + (val3 << 8);364 division_tabs[i][j] = val1 + (val2 << 4) + (val3 << 8);
365 }
366 }365 }
367 }366 }
367 }
368 368
369 369
370 for (i = 0; i < 7; i++) {370 for (i = 0; i < 7; i++) {
371 float f;371 float f;
372 INTFLOAT v;372 INTFLOAT v;
373 if (i != 6) {373 if (i != 6) {
374 f = tan((double)i * M_PI / 12.0);374 f = tan((double)i * M_PI / 12.0);
375 v = FIXR(f / (1.0 + f));375 v = FIXR(f / (1.0 + f));
376 } else {376 } else {
377 v = FIXR(1.0);377 v = FIXR(1.0);
378 }
379 is_table[0][ i] = v;
380 is_table[1][6 - i] = v;
381 }378 }
382 /* invalid values */379 is_table[0][ i] = v;
383 for (i = 7; i < 16; i++)380 is_table[1][6 - i] = v;
384 is_table[0][i] = is_table[1][i] = 0.0;381 }
385 382 /* invalid values */
386 for (i = 0; i < 16; i++) {383 for (i = 7; i < 16; i++)
387 double f;384 is_table[0][i] = is_table[1][i] = 0.0;
388 int e, k;385
389 386 for (i = 0; i < 16; i++) {
390 for (j = 0; j < 2; j++) {387 double f;
391 e = -(j + 1) * ((i + 1) >> 1);388 int e, k;
392 f = pow(2.0, e / 4.0);389
393 k = i & 1;390 for (j = 0; j < 2; j++) {
394 is_table_lsf[j][k ^ 1][i] = FIXR(f);391 e = -(j + 1) * ((i + 1) >> 1);
395 is_table_lsf[j][k ][i] = FIXR(1.0);392 f = pow(2.0, e / 4.0);
396 av_dlog(avctx, "is_table_lsf %d %d: %f %f\n",393 k = i & 1;
397 i, j, (float) is_table_lsf[j][0][i],394 is_table_lsf[j][k ^ 1][i] = FIXR(f);
398 (float) is_table_lsf[j][1][i]);395 is_table_lsf[j][k ][i] = FIXR(1.0);
399 }396 av_dlog(avctx, "is_table_lsf %d %d: %f %f\n",
397 i, j, (float) is_table_lsf[j][0][i],
398 (float) is_table_lsf[j][1][i]);
400 }399 }
400 }
401 401
402 for (i = 0; i < 8; i++) {402 for (i = 0; i < 8; i++) {
403 float ci, cs, ca;403 float ci, cs, ca;
404 ci = ci_table[i];404 ci = ci_table[i];
405 cs = 1.0 / sqrt(1.0 + ci * ci);405 cs = 1.0 / sqrt(1.0 + ci * ci);
406 ca = cs * ci;406 ca = cs * ci;
407#if !CONFIG_FLOAT407#if !CONFIG_FLOAT
408 csa_table[i][0] = FIXHR(cs/4);408 csa_table[i][0] = FIXHR(cs/4);
409 csa_table[i][1] = FIXHR(ca/4);409 csa_table[i][1] = FIXHR(ca/4);
410 csa_table[i][2] = FIXHR(ca/4) + FIXHR(cs/4);410 csa_table[i][2] = FIXHR(ca/4) + FIXHR(cs/4);
411 csa_table[i][3] = FIXHR(ca/4) - FIXHR(cs/4);411 csa_table[i][3] = FIXHR(ca/4) - FIXHR(cs/4);
412#else412#else
413 csa_table[i][0] = cs;413 csa_table[i][0] = cs;
414 csa_table[i][1] = ca;414 csa_table[i][1] = ca;
415 csa_table[i][2] = ca + cs;415 csa_table[i][2] = ca + cs;
416 csa_table[i][3] = ca - cs;416 csa_table[i][3] = ca - cs;
417#endif417#endif
418 }418 }
419 419
420 /* compute mdct windows */420 /* compute mdct windows */
421 for (i = 0; i < 36; i++) {421 for (i = 0; i < 36; i++) {
422 for (j = 0; j < 4; j++) {422 for (j = 0; j < 4; j++) {
423 double d;423 double d;
424
425 if (j == 2 && i % 3 != 1)
426 continue;
427
428 d = sin(M_PI * (i + 0.5) / 36.0);
429 if (j == 1) {
430 if (i >= 30) d = 0;
431 else if (i >= 24) d = sin(M_PI * (i - 18 + 0.5) / 12.0);
432 else if (i >= 18) d = 1;
433 } else if (j == 3) {
434 if (i < 6) d = 0;
435 else if (i < 12) d = sin(M_PI * (i - 6 + 0.5) / 12.0);
436 else if (i < 18) d = 1;
437 }
438 //merge last stage of imdct into the window coefficients
439 d *= 0.5 / cos(M_PI * (2 * i + 19) / 72);
440 424
441 if (j == 2)425 if (j == 2 && i % 3 != 1)
442 mdct_win[j][i/3] = FIXHR((d / (1<<5)));426 continue;
443 else427
444 mdct_win[j][i ] = FIXHR((d / (1<<5)));428 d = sin(M_PI * (i + 0.5) / 36.0);
429 if (j == 1) {
430 if (i >= 30) d = 0;
431 else if (i >= 24) d = sin(M_PI * (i - 18 + 0.5) / 12.0);
432 else if (i >= 18) d = 1;
433 } else if (j == 3) {
434 if (i < 6) d = 0;
435 else if (i < 12) d = sin(M_PI * (i - 6 + 0.5) / 12.0);
436 else if (i < 18) d = 1;
445 }437 }
438 //merge last stage of imdct into the window coefficients
439 d *= 0.5 / cos(M_PI * (2 * i + 19) / 72);
440
441 if (j == 2)
442 mdct_win[j][i/3] = FIXHR((d / (1<<5)));
443 else
444 mdct_win[j][i ] = FIXHR((d / (1<<5)));
446 }445 }
446 }
447 447
448 /* NOTE: we do frequency inversion adter the MDCT by changing448 /* NOTE: we do frequency inversion adter the MDCT by changing
449 the sign of the right window coefs */449 the sign of the right window coefs */
450 for (j = 0; j < 4; j++) {450 for (j = 0; j < 4; j++) {
451 for (i = 0; i < 36; i += 2) {451 for (i = 0; i < 36; i += 2) {
452 mdct_win[j + 4][i ] = mdct_win[j][i ];452 mdct_win[j + 4][i ] = mdct_win[j][i ];
453 mdct_win[j + 4][i + 1] = -mdct_win[j][i + 1];453 mdct_win[j + 4][i + 1] = -mdct_win[j][i + 1];
454 }
455 }454 }
455 }
456}456}
457 457
458static av_cold int decode_init(AVCodecContext * avctx)458static av_cold int decode_init(AVCodecContext * avctx)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t