diff --git a/libavcodec/aptx.c b/libavcodec/aptx.c index 6c0f3d35a9c89051fbac851e08473f200887cc86..8750d8421fb4e1dfa5cec8cee0bf3be7cfde66bd 100644 --- a/libavcodec/aptx.c +++ b/libavcodec/aptx.c @@ -394,58 +394,58 @@ typedef const struct { } ConstTables; static ConstTables tables[2][NB_SUBBANDS] = { -{ - [LF] = { quantize_intervals_LF, - invert_quantize_dither_factors_LF, - quantize_dither_factors_LF, - quantize_factor_select_offset_LF, - FF_ARRAY_ELEMS(quantize_intervals_LF), - 0x11FF, 24 }, - [MLF] = { quantize_intervals_MLF, - invert_quantize_dither_factors_MLF, - quantize_dither_factors_MLF, - quantize_factor_select_offset_MLF, - FF_ARRAY_ELEMS(quantize_intervals_MLF), - 0x14FF, 12 }, - [MHF] = { quantize_intervals_MHF, - invert_quantize_dither_factors_MHF, - quantize_dither_factors_MHF, - quantize_factor_select_offset_MHF, - FF_ARRAY_ELEMS(quantize_intervals_MHF), - 0x16FF, 6 }, - [HF] = { quantize_intervals_HF, - invert_quantize_dither_factors_HF, - quantize_dither_factors_HF, - quantize_factor_select_offset_HF, - FF_ARRAY_ELEMS(quantize_intervals_HF), - 0x15FF, 12 }, -}, -{ - [LF] = { hd_quantize_intervals_LF, - hd_invert_quantize_dither_factors_LF, - hd_quantize_dither_factors_LF, - hd_quantize_factor_select_offset_LF, - FF_ARRAY_ELEMS(hd_quantize_intervals_LF), - 0x11FF, 24 }, - [MLF] = { hd_quantize_intervals_MLF, - hd_invert_quantize_dither_factors_MLF, - hd_quantize_dither_factors_MLF, - hd_quantize_factor_select_offset_MLF, - FF_ARRAY_ELEMS(hd_quantize_intervals_MLF), - 0x14FF, 12 }, - [MHF] = { hd_quantize_intervals_MHF, - hd_invert_quantize_dither_factors_MHF, - hd_quantize_dither_factors_MHF, - hd_quantize_factor_select_offset_MHF, - FF_ARRAY_ELEMS(hd_quantize_intervals_MHF), - 0x16FF, 6 }, - [HF] = { hd_quantize_intervals_HF, - hd_invert_quantize_dither_factors_HF, - hd_quantize_dither_factors_HF, - hd_quantize_factor_select_offset_HF, - FF_ARRAY_ELEMS(hd_quantize_intervals_HF), - 0x15FF, 12 }, -} + { + [LF] = { quantize_intervals_LF, + invert_quantize_dither_factors_LF, + quantize_dither_factors_LF, + quantize_factor_select_offset_LF, + FF_ARRAY_ELEMS(quantize_intervals_LF), + 0x11FF, 24 }, + [MLF] = { quantize_intervals_MLF, + invert_quantize_dither_factors_MLF, + quantize_dither_factors_MLF, + quantize_factor_select_offset_MLF, + FF_ARRAY_ELEMS(quantize_intervals_MLF), + 0x14FF, 12 }, + [MHF] = { quantize_intervals_MHF, + invert_quantize_dither_factors_MHF, + quantize_dither_factors_MHF, + quantize_factor_select_offset_MHF, + FF_ARRAY_ELEMS(quantize_intervals_MHF), + 0x16FF, 6 }, + [HF] = { quantize_intervals_HF, + invert_quantize_dither_factors_HF, + quantize_dither_factors_HF, + quantize_factor_select_offset_HF, + FF_ARRAY_ELEMS(quantize_intervals_HF), + 0x15FF, 12 }, + }, + { + [LF] = { hd_quantize_intervals_LF, + hd_invert_quantize_dither_factors_LF, + hd_quantize_dither_factors_LF, + hd_quantize_factor_select_offset_LF, + FF_ARRAY_ELEMS(hd_quantize_intervals_LF), + 0x11FF, 24 }, + [MLF] = { hd_quantize_intervals_MLF, + hd_invert_quantize_dither_factors_MLF, + hd_quantize_dither_factors_MLF, + hd_quantize_factor_select_offset_MLF, + FF_ARRAY_ELEMS(hd_quantize_intervals_MLF), + 0x14FF, 12 }, + [MHF] = { hd_quantize_intervals_MHF, + hd_invert_quantize_dither_factors_MHF, + hd_quantize_dither_factors_MHF, + hd_quantize_factor_select_offset_MHF, + FF_ARRAY_ELEMS(hd_quantize_intervals_MHF), + 0x16FF, 6 }, + [HF] = { hd_quantize_intervals_HF, + hd_invert_quantize_dither_factors_HF, + hd_quantize_dither_factors_HF, + hd_quantize_factor_select_offset_HF, + FF_ARRAY_ELEMS(hd_quantize_intervals_HF), + 0x15FF, 12 }, + } }; static const int16_t quantization_factors[32] = {