Commit a1f8e7bb authored by vasilache's avatar vasilache
Browse files

fix clang

parent 35df86a7

lib_com/rom_com_fx.c

+338 −306
Original line number Diff line number Diff line
@@ -27838,13 +27838,15 @@ const Word16 scales_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors Q11*/ 
        { 2611, 5034, 0, 3138, 0, 0 },          /* 18 */

        { 2611, 5034, 0, 3340, 0, 0 },          /* 19 */

        { 2165, 3674, 5931, 2363, 3809, 6281 }, /* 25 */

    { 1898, 2986, 4745, 2116, 3668, 7045 }, /* 28*/ /* mode 0 UV WB*/

        { 1898, 2986, 4745, 2116, 3668, 7045 },

        /* 28*/                                  /* mode 0 UV WB*/

        { 2630, 5480, 0, 2972, 0, 0 },           /* 18 */

        { 2802, 0, 0, 2869, 5073, 0 },           /* 19 */

        { 1763, 2546, 3723, 2515, 4559, 21109 }, /* 24 */

        { 2195, 3961, 7440, 2501, 6017, 21961 }, /* 25 */

        { 1841, 2902, 1386, 2116, 3762, 22309 }, /* 29 */

    { 1700, 2710, 1288, 1866, 3246, 20660 }, /* 32 */ /* mode 1 UV NB*/

        { 1700, 2710, 1288, 1866, 3246, 20660 },

        /* 32 */                             /* mode 1 UV NB*/

        { 3222, 0, 0, 3391, 0, 0 },          /* 17 */

        { 2537, 4923, 0, 3187, 0, 0 },       /* 18 */

        { 2816, 4229, 6398, 3676, 0, 0 },    /* (18.745) 19 */
@@ -27865,7 +27867,8 @@ const Word16 scales_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors Q11*/ 
        { 1532, 2259, 5870, 2421, 1661, 6824 }, /* 34*/

        { 1567, 2318, 3777, 2544, 3877, 1888 }, /* (34.981) 35 */

        { 1569, 2320, 3781, 2183, 3361, 1665 }, /* (35.998) 36 */

    { 1386, 1972, 4356, 1487, 2216, 4514 }, /* 37*/ /* mode 2 V WB*/

        { 1386, 1972, 4356, 1487, 2216, 4514 },

        /* 37*/                                 /* mode 2 V WB*/

        { 3357, 0, 0, 2494, 4426, 0 },          /* 17 */

        { 2634, 5009, 0, 2888, 0, 0 },          /* 18 */

        { 2224, 3539, 7696, 2494, 4426, 0 },    /* 22 */
@@ -27875,7 +27878,8 @@ const Word16 scales_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors Q11*/ 
        { 1839, 2658, 4473, 2490, 5456, 0 },    /* 27 */

        { 1722, 2533, 4581, 2038, 3394, 5808 }, /* 29 */

        { 1427, 2009, 4184, 1915, 3082, 1350 }, /* 34 */

    { 1370, 1862, 2720, 2017, 1339, 3914 }, /* 37 */ /* mode 3 V NB*/

        { 1370, 1862, 2720, 2017, 1339, 3914 },

        /* 37 */                                /* mode 3 V NB*/

        { 2482, 3885, 0, 0, 0, 0 },             /* 12 (11.883) */

        { 2376, 3828, 6975, 0, 0, 0 },          /* (12.997) 13 */

        { 3396, 0, 0, 3883, 0, 0 },             /* (13.640) 14 */
@@ -27896,7 +27900,8 @@ const Word16 scales_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors Q11*/ 
        { 2202, 3619, 1618, 2238, 3895, 6173 }, /* 29 (28.984) */

        { 1829, 3015, 1382, 2259, 3625, 5820 }, /* 30 (29.980) */

        { 1864, 3170, 1403, 2114, 3381, 5147 }, /* 31 (30.966) */

    { 1692, 2572, 1294, 2009, 3158, 4540 }, /* 32 (31.995) */ /* G WB*/

        { 1692, 2572, 1294, 2009, 3158, 4540 },

        /* 32 (31.995) */                       /* G WB*/

        { 2425, 3707, 5655, 0, 0, 0 },          /* 12 (11.925) */

        { 3299, 0, 0, 3314, 0, 0 },             /* 16 (15.826) */

        { 2425, 3707, 5655, 3174, 0, 0 },       /* 19 (18.745) */
@@ -27911,24 +27916,30 @@ const Word16 scales_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors Q11*/ 
        { 1898, 3277, 1380, 2363, 3637, 5845 }, /* 29 (28.996) */

        { 2144, 1479, 3656, 2163, 3363, 5532 }, /* 30 (29.988) */

        { 1989, 1409, 3090, 2136, 3543, 6003 }, /* 31 (30.962) */

    { 1882, 1356, 2800, 2165, 3703, 6285 }, /* 32 (31.987) */ /* G NB*/

        { 1882, 1356, 2800, 2165, 3703, 6285 },

        /* 32 (31.987) */              /* G NB*/

        { 3312, 0, 0, 3394, 0, 0 },    /* 17 */

        { 2611, 4706, 0, 3201, 0, 0 }, /* 18 */

    { 2820, 5218, 0, 4129, 0, 0 }, /* (18.572) 19 */  /* from GEWB */

        { 2820, 5218, 0, 4129, 0, 0 },

        /* (18.572) 19 */                 /* from GEWB */

        { 2660, 4135, 0, 4129, 0, 0 },    /* (19.796) 20 */

        { 2679, 4821, 0, 2841, 0, 0 },    /* 21 */

        { 2644, 4952, 0, 2775, 5003, 0 }, /* 22 */

    { 2402, 3619, 5726, 3252, 6201, 0 }, /* (22.959) 23 */ /* from GEWB */

        { 2402, 3619, 5726, 3252, 6201, 0 },

        /* (22.959) 23 */                    /* from GEWB */

        { 2210, 3623, 6169, 2841, 0, 0 },    /* 24 */

        { 2210, 3623, 6169, 2714, 5233, 0 }, /* 25 */

    { 1993, 2851, 4125, 3262, 6519, 0 }, /* (25.904) 26 */ /* from GEWB */

        { 1993, 2851, 4125, 3262, 6519, 0 },

        /* (25.904) 26 */                       /* from GEWB */

        { 2353, 3836, 1737, 3262, 6519, 0 },    /* (26.829) 27 */

        { 1837, 2744, 5333, 2191, 3459, 5175 }, /* 28 */

    { 2353, 3836, 1737, 2701, 4686, 7551 }, /* (28.984) 29 */ /* from GEWB */

        { 2353, 3836, 1737, 2701, 4686, 7551 },

        /* (28.984) 29 */                       /* from GEWB */

        { 1837, 2744, 5333, 1923, 2978, 4266 }, /* 30 */

        { 1853, 2718, 5323, 2271, 1591, 3492 },

        { 1561, 2255, 4831, 1923, 2978, 4266 },

    { 1626, 2511, 6513, 2271, 1591, 3492 }, /* 33 */ /* mode 6 T WB */

        { 1626, 2511, 6513, 2271, 1591, 3492 },

        /* 33 */                                /* mode 6 T WB */

        { 3336, 0, 0, 2439, 4528, 0 },          /* 17 */

        { 2615, 5237, 0, 2800, 0, 0 },          /* 18 */

        { 2216, 3607, 8047, 2439, 4528, 0 },    /* 22 */
@@ -27937,9 +27948,11 @@ const Word16 scales_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors Q11*/ 
        { 1864, 3572, 6793, 2439, 4528, 0 },    /* 25 */

        { 1884, 3375, 6283, 1985, 3447, 8096 }, /* 28 */

        { 1513, 2275, 5517, 1800, 2890, 4721 }, /* 31 */

    { 1452, 2114, 5564, 1659, 2550, 3736 }, /* 32*/ /* mode 7 T NB*/

        { 1452, 2114, 5564, 1659, 2550, 3736 },

        /* 32*/                                 /* mode 7 T NB*/

        { 1552, 2286, 4022, 4139, 1634, 2497 }, /* 31 */

    { 1432, 2118, 4051, 4139, 1634, 2497 }, /* 32 */ /* mode 8 G 16k */

        { 1432, 2118, 4051, 4139, 1634, 2497 },

        /* 32 */                                /* mode 8 G 16k */

        { 1487, 2150, 3779, 2775, 1761, 4516 }, /* 32 (31.998) */

        { 1386, 2042, 3418, 2775, 1761, 4516 }, /* 33 (32.983) mode 9 T16k */

        { 3371, 0, 0, 2568, 5036, 0 },          /* 17 */
@@ -27961,15 +27974,18 @@ const Word16 scales_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors Q11*/ 
        { 2099, 1452, 3545, 2521, 4706, 7946 }, /* (32.996) 33 */

        { 1980, 1460, 3385, 3768, 2253, 5794 }, /* (33.994) 34 */

        { 2025, 1430, 3279, 2224, 4022, 5902 }, /* (34.954) 35 */

    { 1233, 1780, 2904, 2589, 1565, 4542 }, /* 36 */ /* mode 10 AUDIO_WB LVQ bitrate 15-36 + 4 + 1*/

        { 1233, 1780, 2904, 2589, 1565, 4542 },

        /* 36 */                                /* mode 10 AUDIO_WB LVQ bitrate 15-36 + 4 + 1*/

        { 1747, 3623, 9062, 2048, 2048, 2048 }, /* 17 */

        { 2071, 3406, 9017, 3232, 0, 0 },       /* 21 */

        { 2071, 3406, 9017, 2462, 4964, 0 },    /* 22 */

        { 1804, 3314, 8471, 2462, 4964, 0 },    /* 25 */

        { 1735, 3668, 9146, 2462, 4964, 0 },    /* 26 */

    { 1372, 2277, 4893, 2462, 4964, 0 }, /* 28 */ /* mode 11 AUDIO_NB */

        { 1372, 2277, 4893, 2462, 4964, 0 },

        /* 28 */                             /* mode 11 AUDIO_NB */

        { 2316, 3717, 1630, 2591, 5722, 0 }, /* 26 */

    { 1167, 1647, 2451, 2380, 3992, 1491 }, /* 36*/ /* mode 12 AUDIO_WB 16k bitrate 15-36 + 4 + 1*/

        { 1167, 1647, 2451, 2380, 3992, 1491 },

        /* 36*/                                 /* mode 12 AUDIO_WB 16k bitrate 15-36 + 4 + 1*/

        { 2140, 3248, 7688, 3418, 0, 0 },       /* 22 (21.776) */

        { 2253, 3285, 4700, 2732, 4962, 0 },    /* (22.959) 23 */

        { 2234, 3588, 6480, 2882, 0, 0 },       /* (23.949) 24 */
@@ -27985,7 +28001,8 @@ const Word16 scales_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors Q11*/ 
        { 1473, 2091, 3484, 2292, 1626, 3473 }, /* 34 (33.968) */

        { 1718, 1311, 3117, 2290, 3475, 1630 }, /* (34.968) 35 */

        { 1718, 1311, 3117, 1968, 3009, 1448 }, /* (35.990) 36 */

    { 1311, 1810, 3547, 1546, 2232, 3170 }, /* 37 (36.995) */ /* VOICED 16k */

        { 1311, 1810, 3547, 1546, 2232, 3170 },

        /* 37 (36.995) */                        /* VOICED 16k */

        { 2494, 1630, 4676, 2642, 6810, 0 },     /* 25 (24.980) */

        { 3256, 1710, 9085, 2247, 6287, 0 },     /* 25 (24.974) */

        { 2036, 5360, 0, 2234, 4573, 7080 },     /* 25 (24.852) */
@@ -28035,7 +28052,8 @@ const Word16 scales_p_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors 20 modes Q11 */ 
        { 1327, 2107, 3760, 1749, 2777, 4016 }, /* 36 (35.889) */

        { 1243, 1913, 3107, 1604, 2484, 3142 }, /* (36.996) 37 */

        { 1227, 1853, 3131, 1497, 2275, 3072 }, /* (37.993) 38 */

        { 1327, 2107, 3760, 1407, 2167, 3891 }, /* 39 (38.488) */ /* V WB*/

        { 1327, 2107, 3760, 1407, 2167, 3891 },

        /* 39 (38.488) */                       /* V WB*/

        { 3303, 0, 0, 0, 0, 0 },                /*  8 (7.913) */

        { 2595, 5069, 0, 3316, 0, 0 },          /* 19 (18.572) */

        { 2077, 3338, 5046, 2632, 4405, 0 },    /* 23 (22.773) */
@@ -28050,7 +28068,8 @@ const Word16 scales_p_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors 20 modes Q11 */ 
        { 1358, 2173, 2535, 2824, 1839, 3996 }, /* 34 (33.992) */

        { 1378, 2261, 2675, 2578, 1696, 4002 }, /* 35 (35.000) */

        { 1364, 2193, 2558, 1645, 2542, 3541 }, /* 36 (35.980) */

        { 1348, 2128, 2486, 1946, 1333, 2927 }, /* 39 (38.512) */ /* V NB*/

        { 1348, 2128, 2486, 1946, 1333, 2927 },

        /* 39 (38.512) */                       /* V NB*/

        { 3277, 0, 0, 3181, 0, 0 },             /* 15 (14.733) */

        { 2675, 4970, 0, 3236, 0, 0 },          /* (15.730) 16 */

        { 2675, 4970, 0, 3432, 0, 0 },          /* (16.823) 17 */
@@ -28071,7 +28090,8 @@ const Word16 scales_p_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors 20 modes Q11 */ 
        { 1356, 2101, 3183, 2200, 3918, 6189 }, /* 32 (31.987) */

        { 1352, 2148, 3217, 2947, 1896, 4364 }, /* 33 (32.982) */

        { 1290, 1978, 3117, 2687, 1804, 4520 }, /* 34 (33.967) */

        { 1264, 1886, 2963, 2114, 3172, 1548 }, /* 35 (34.994) */ /* G WB*/

        { 1264, 1886, 2963, 2114, 3172, 1548 },

        /* 35 (34.994) */                        /* G WB*/

        { 3267, 0, 0, 3076, 0, 0 },              /* 15 (14.733) */

        { 2300, 3985, 7643, 3076, 0, 0 },        /* 19 (18.792) */

        { 2116, 4250, 8886, 2906, 5009, 0 },     /* 22 (21.985) */
@@ -28086,7 +28106,8 @@ const Word16 scales_p_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors 20 modes Q11 */ 
        { 1411, 2654, 14930, 2081, 3840, 6633 }, /* 32 (31.963) */

        { 1430, 2611, 14764, 1872, 3170, 4983 }, /* 33 (32.997) */

        { 1391, 2693, 14930, 2517, 3779, 1665 }, /* 34 (33.986) */

        { 1391, 2693, 14930, 2433, 1581, 4004 }, /* 35 (34.952) */ /* G NB*/

        { 1391, 2693, 14930, 2433, 1581, 4004 },

        /* 35 (34.952) */                       /* G NB*/

        { 2071, 3639, 5652, 3305, 0, 0 },       /* 21 */

        { 1974, 3236, 8184, 3541, 0, 0 },       /* (21.776) 22 */

        { 1798, 2949, 4688, 3541, 0, 0 },       /* (22.784) 23 */
@@ -28106,13 +28127,15 @@ const Word16 scales_p_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors 20 modes Q11 */ 
        { 1552, 2275, 1126, 1784, 2800, 3903 }, /* (36.969) 37 */

        { 1128, 1569, 2286, 1620, 2460, 3406 }, /* (37.971) 38 */

        { 1128, 1569, 2286, 1972, 1427, 2710 }, /* (38.973) 39 */

        { 1075, 1577, 2198, 1669, 2533, 1161 }, /* 40 */ /* mode 7 AUDIO_WB 19-40 + 0 + 1 */

        { 1075, 1577, 2198, 1669, 2533, 1161 },

        /* 40 */                                /* mode 7 AUDIO_WB 19-40 + 0 + 1 */

        { 2191, 3668, 7993, 3275, 0, 0 },       /* 21 */

        { 1679, 2492, 4278, 2570, 4690, 0 },    /* 25 */

        { 1597, 2394, 5110, 2570, 4690, 0 },    /* 26 */

        { 2202, 1481, 4835, 2273, 4016, 7150 }, /* 30 */

        { 1415, 2107, 4786, 2118, 3668, 8200 }, /* 31 */

        { 1374, 2204, 5337, 1956, 3168, 5149 }, /* 32 */ /*mode 8 AUDIO_NB  */

        { 1374, 2204, 5337, 1956, 3168, 5149 },

        /* 32 */                                /*mode 8 AUDIO_NB  */

        { 2425, 1589, 4336, 2165, 3420, 1380 }, /* 30 */

        { 1937, 2966, 5577, 2855, 5417, 9382 }, /* (30.967) 31 */

        { 1942, 2978, 5577, 4035, 2404, 7135 }, /* (31.990) 32 */
@@ -28123,14 +28146,16 @@ const Word16 scales_p_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors 20 modes Q11 */ 
        { 1673, 2429, 4080, 3262, 1995, 5364 }, /* (36.986) 37 */

        { 1683, 2468, 4299, 2998, 1851, 4911 }, /* (37.982) 38 */

        { 1683, 2468, 4299, 4205, 1714, 2783 }, /* (38.995) 39 */

        { 1067, 1530, 2116, 1630, 2730, 1110 }, /* 40 */ /* mode 9 AUDIO_WB 16k 30-40 + 5 MA pred for WB2 (AV: not used?)*/

        { 1067, 1530, 2116, 1630, 2730, 1110 },

        /* 40 */                             /* mode 9 AUDIO_WB 16k 30-40 + 5 MA pred for WB2 (AV: not used?)*/

        { 3439, 0, 0, 2626, 5061, 0 },       /* 17 (16.823) */

        { 2228, 3787, 6543, 3455, 0, 0 },    /* 21 (20.910) */

        { 2228, 3787, 6543, 2626, 5061, 0 }, /* 22 (21.907) */

        { 2306, 3459, 1618, 2626, 5061, 0 }, /* 25 (24.863) */

        { 1905, 2830, 1397, 2626, 5061, 0 }, /* 26 (25.921) */

        { 2284, 1626, 3793, 2623, 6212, 0 }, /* 27 (26.837) */

        { 1720, 2818, 1276, 1638, 2900, 8724 }, /* 36 (35.998) */ /* INACTIVE NB */

        { 1720, 2818, 1276, 1638, 2900, 8724 },

        /* 36 (35.998) */                       /* INACTIVE NB */

        { 1640, 2351, 3690, 0, 0, 0 },          /* 17 (16.932) */

        { 2753, 5380, 0, 3224, 0, 0 },          /* (17.479) 18 */

        { 2580, 4188, 0, 3224, 0, 0 },          /* (18.703) 19 */
@@ -28150,21 +28175,24 @@ const Word16 scales_p_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors 20 modes Q11 */ 
        { 1698, 1292, 2738, 2169, 4162, 7021 }, /* (32.999) 33 */

        { 1763, 1327, 2988, 3156, 1884, 5143 }, /* (33.994) 34 */

        { 1737, 1296, 2781, 2884, 1800, 5552 }, /* (34.989) 35 */

        { 1829, 1335, 2945, 2204, 1475, 3674 }, /* 36 (35.929) */ /* INACTIVE WB*/

        { 1829, 1335, 2945, 2204, 1475, 3674 },

        /* 36 (35.929) */                    /* INACTIVE WB*/

        { 2783, 4723, 0, 3418, 0, 0 },       /* 17 (16.823) */

        { 2206, 3946, 7262, 3418, 0, 0 },    /* 21 (20.910) */

        { 2206, 4162, 7328, 2927, 5552, 0 }, /* 22 (21.985) */

        { 1706, 2566, 4311, 2628, 5235, 0 }, /* 25 (24.845) */

        { 1589, 2359, 3805, 2628, 5235, 0 }, /* 26 (25.934) */

        { 1473, 2183, 3547, 2628, 5235, 0 }, /* 27 (26.914) */

        { 1927, 1333, 3205, 1479, 2437, 3973 }, /* 36 (35.915) */  /* INACTIVE 16k*/

        { 1927, 1333, 3205, 1479, 2437, 3973 },

        /* 36 (35.915) */                       /* INACTIVE 16k*/

        { 2646, 5077, 0, 3156, 0, 0 },          /* 18 (17.479) */

        { 2462, 3897, 0, 3156, 0, 0 },          /* 19 (18.703) */

        { 2105, 3361, 5028, 3375, 0, 0 },       /* 22 (21.776) */

        { 2554, 1798, 4770, 3375, 0, 0 },       /* 23 (22.791) */

        { 1767, 2781, 5165, 3375, 0, 0 },       /* 24 (23.999) */

        { 1673, 2503, 4116, 2200, 3656, 5597 }, /* 29 (28.966) */

        { 1669, 1253, 2623, 2161, 3531, 6046 }, /* 32 (31.990) */ /* UNVOICED NB */

        { 1669, 1253, 2623, 2161, 3531, 6046 },

        /* 32 (31.990) */                    /* UNVOICED NB */

        { 3164, 0, 0, 3170, 0, 0 },          /* 14 (13.640) */

        { 3359, 0, 0, 3170, 0, 0 },          /* 15 (14.733) */

        { 2724, 0, 0, 3271, 0, 0 },          /* (15.826) 16 */
@@ -28179,7 +28207,8 @@ const Word16 scales_p_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors 20 modes Q11 */ 
        { 1907, 2986, 5018, 2650, 5616, 0 }, /* 25 (24.992) */

        { 2288, 1507, 3840, 2562, 5257, 0 }, /* (25.993) 26 */

        { 1581, 2531, 3934, 2562, 5257, 0 }, /* (26.883) 27 */

        { 1796, 2859, 5605, 2214, 3719, 6881 }, /* 28 (27.996) */ /* UNVOICED WB*/

        { 1796, 2859, 5605, 2214, 3719, 6881 },

        /* 28 (27.996) */                       /* UNVOICED WB*/

        { 2316, 3351, 0, 2808, 0, 0 },          /* 24 (23.818) */

        { 1827, 3260, 7012, 2658, 6566, 0 },    /* (24.961) 25 */

        { 1792, 3168, 7084, 2632, 5937, 8499 }, /* (25.964) 26 */
@@ -28195,7 +28224,8 @@ const Word16 scales_p_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors 20 modes Q11 */ 
        { 1522, 2048, 1227, 1917, 3811, 5886 }, /* 36 (35.994) */

        { 1536, 6492, 3942, 1509, 2914, 5503 }, /* (36.977) 37 */

        { 1536, 6492, 3942, 1350, 2169, 4045 }, /* (37.984) 38 */

        { 1587, 1257, 2124, 1630, 2671, 3901 }, /* 39 (38.301) */ /* VOICED 16k */

        { 1587, 1257, 2124, 1630, 2671, 3901 },

        /* 39 (38.301) */                       /* VOICED 16k */

        { 1831, 2742, 5220, 2679, 5327, 0 },    /* 26 (25.917) */

        { 1704, 2568, 3967, 2677, 5353, 0 },    /* (26.887) 27 */

        { 1704, 2523, 3924, 2372, 4049, 0 },    /* (27.974) 28 */
@@ -28207,7 +28237,8 @@ const Word16 scales_p_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors 20 modes Q11 */ 
        { 1401, 1974, 3359, 2392, 3637, 1612 }, /* 34 (33.974) */

        { 1368, 1915, 3176, 2081, 3109, 1458 }, /* 35 (34.989) */

        { 1350, 1866, 2918, 2738, 1821, 1315 }, /* 36 (35.988) */

        { 1350, 1866, 2918, 1718, 2636, 1243 }, /* 37 (36.989) */ /* GENERIC 16k*/

        { 1350, 1866, 2918, 1718, 2636, 1243 },

        /* 37 (36.989) */                       /* GENERIC 16k*/

        { 3344, 0, 0, 3455, 0, 0 },             /* 16 (15.826) */

        { 3463, 0, 0, 3428, 0, 0 },             /* (15.826) 16 */

        { 2720, 5251, 0, 3181, 0, 0 },          /* (17.479) 18 */
@@ -28229,7 +28260,8 @@ const Word16 scales_p_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors 20 modes Q11 */ 
        { 1683, 1257, 2638, 1864, 3090, 4618 }, /* 34 (33.987) */

        { 1722, 1278, 2617, 2378, 1561, 3703 }, /* 35 (34.994) */

        { 1716, 1274, 2593, 2212, 1456, 3502 }, /* 36 (35.968) */

        { 1704, 1268, 2611, 1921, 2929, 1319 }, /* 37 (36.971) */ /* GENERIC 12.8k MA*/

        { 1704, 1268, 2611, 1921, 2929, 1319 },

        /* 37 (36.971) */                                        /* GENERIC 12.8k MA*/

        { 1810, 2763, 5263, 2691, 5343, 0 },                     /* 26 (25.917) */

        { 2009, 3017, 5702, 3461, 6844, 0 },                     /* (26.981) 27 */

        { 1976, 3101, 5501, 2886, 5089, 8081 },                  /* (27.989) 28 */