Unified · Split
| @@ -394,58 +394,58 @@ typedef const struct { · 393 unmodified lines | ||
| 394 | 394 | } ConstTables; |
| 395 | 395 | |
| 396 | 396 | static ConstTables tables[2][NB_SUBBANDS] = { |
| 397 | −{ | |
| 398 | − [LF] = { quantize_intervals_LF, | |
| 399 | − invert_quantize_dither_factors_LF, | |
| 400 | − quantize_dither_factors_LF, | |
| 401 | − quantize_factor_select_offset_LF, | |
| 402 | − FF_ARRAY_ELEMS(quantize_intervals_LF), | |
| 403 | − 0x11FF, 24 }, | |
| 404 | − [MLF] = { quantize_intervals_MLF, | |
| 405 | − invert_quantize_dither_factors_MLF, | |
| 406 | − quantize_dither_factors_MLF, | |
| 407 | − quantize_factor_select_offset_MLF, | |
| 408 | − FF_ARRAY_ELEMS(quantize_intervals_MLF), | |
| 409 | − 0x14FF, 12 }, | |
| 410 | − [MHF] = { quantize_intervals_MHF, | |
| 411 | − invert_quantize_dither_factors_MHF, | |
| 412 | − quantize_dither_factors_MHF, | |
| 413 | − quantize_factor_select_offset_MHF, | |
| 414 | − FF_ARRAY_ELEMS(quantize_intervals_MHF), | |
| 415 | − 0x16FF, 6 }, | |
| 416 | − [HF] = { quantize_intervals_HF, | |
| 417 | − invert_quantize_dither_factors_HF, | |
| 418 | − quantize_dither_factors_HF, | |
| 419 | − quantize_factor_select_offset_HF, | |
| 420 | − FF_ARRAY_ELEMS(quantize_intervals_HF), | |
| 421 | − 0x15FF, 12 }, | |
| 422 | −}, | |
| 423 | −{ | |
| 424 | − [LF] = { hd_quantize_intervals_LF, | |
| 425 | − hd_invert_quantize_dither_factors_LF, | |
| 426 | − hd_quantize_dither_factors_LF, | |
| 427 | − hd_quantize_factor_select_offset_LF, | |
| 428 | − FF_ARRAY_ELEMS(hd_quantize_intervals_LF), | |
| 429 | − 0x11FF, 24 }, | |
| 430 | − [MLF] = { hd_quantize_intervals_MLF, | |
| 431 | − hd_invert_quantize_dither_factors_MLF, | |
| 432 | − hd_quantize_dither_factors_MLF, | |
| 433 | − hd_quantize_factor_select_offset_MLF, | |
| 434 | − FF_ARRAY_ELEMS(hd_quantize_intervals_MLF), | |
| 435 | − 0x14FF, 12 }, | |
| 436 | − [MHF] = { hd_quantize_intervals_MHF, | |
| 437 | − hd_invert_quantize_dither_factors_MHF, | |
| 438 | − hd_quantize_dither_factors_MHF, | |
| 439 | − hd_quantize_factor_select_offset_MHF, | |
| 440 | − FF_ARRAY_ELEMS(hd_quantize_intervals_MHF), | |
| 441 | − 0x16FF, 6 }, | |
| 442 | − [HF] = { hd_quantize_intervals_HF, | |
| 443 | − hd_invert_quantize_dither_factors_HF, | |
| 444 | − hd_quantize_dither_factors_HF, | |
| 445 | − hd_quantize_factor_select_offset_HF, | |
| 446 | − FF_ARRAY_ELEMS(hd_quantize_intervals_HF), | |
| 447 | − 0x15FF, 12 }, | |
| 448 | −} | |
| 397 | + { | |
| 398 | + [LF] = { quantize_intervals_LF, | |
| 399 | + invert_quantize_dither_factors_LF, | |
| 400 | + quantize_dither_factors_LF, | |
| 401 | + quantize_factor_select_offset_LF, | |
| 402 | + FF_ARRAY_ELEMS(quantize_intervals_LF), | |
| 403 | + 0x11FF, 24 }, | |
| 404 | + [MLF] = { quantize_intervals_MLF, | |
| 405 | + invert_quantize_dither_factors_MLF, | |
| 406 | + quantize_dither_factors_MLF, | |
| 407 | + quantize_factor_select_offset_MLF, | |
| 408 | + FF_ARRAY_ELEMS(quantize_intervals_MLF), | |
| 409 | + 0x14FF, 12 }, | |
| 410 | + [MHF] = { quantize_intervals_MHF, | |
| 411 | + invert_quantize_dither_factors_MHF, | |
| 412 | + quantize_dither_factors_MHF, | |
| 413 | + quantize_factor_select_offset_MHF, | |
| 414 | + FF_ARRAY_ELEMS(quantize_intervals_MHF), | |
| 415 | + 0x16FF, 6 }, | |
| 416 | + [HF] = { quantize_intervals_HF, | |
| 417 | + invert_quantize_dither_factors_HF, | |
| 418 | + quantize_dither_factors_HF, | |
| 419 | + quantize_factor_select_offset_HF, | |
| 420 | + FF_ARRAY_ELEMS(quantize_intervals_HF), | |
| 421 | + 0x15FF, 12 }, | |
| 422 | + }, | |
| 423 | + { | |
| 424 | + [LF] = { hd_quantize_intervals_LF, | |
| 425 | + hd_invert_quantize_dither_factors_LF, | |
| 426 | + hd_quantize_dither_factors_LF, | |
| 427 | + hd_quantize_factor_select_offset_LF, | |
| 428 | + FF_ARRAY_ELEMS(hd_quantize_intervals_LF), | |
| 429 | + 0x11FF, 24 }, | |
| 430 | + [MLF] = { hd_quantize_intervals_MLF, | |
| 431 | + hd_invert_quantize_dither_factors_MLF, | |
| 432 | + hd_quantize_dither_factors_MLF, | |
| 433 | + hd_quantize_factor_select_offset_MLF, | |
| 434 | + FF_ARRAY_ELEMS(hd_quantize_intervals_MLF), | |
| 435 | + 0x14FF, 12 }, | |
| 436 | + [MHF] = { hd_quantize_intervals_MHF, | |
| 437 | + hd_invert_quantize_dither_factors_MHF, | |
| 438 | + hd_quantize_dither_factors_MHF, | |
| 439 | + hd_quantize_factor_select_offset_MHF, | |
| 440 | + FF_ARRAY_ELEMS(hd_quantize_intervals_MHF), | |
| 441 | + 0x16FF, 6 }, | |
| 442 | + [HF] = { hd_quantize_intervals_HF, | |
| 443 | + hd_invert_quantize_dither_factors_HF, | |
| 444 | + hd_quantize_dither_factors_HF, | |
| 445 | + hd_quantize_factor_select_offset_HF, | |
| 446 | + FF_ARRAY_ELEMS(hd_quantize_intervals_HF), | |
| 447 | + 0x15FF, 12 }, | |
| 448 | + } | |
| 449 | 449 | }; |
| 450 | 450 | |
| 451 | 451 | static const int16_t quantization_factors[32] = { |