Commit 219baa74 authored by vaclav's avatar vaclav
Browse files

revert some changes that broke EVS

parent e154b4ff

lib_com/mslvq_com_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -429,7 +429,6 @@ static Word16 decode_indexes_fx( 
        im1 = sub( i, 1 );

        decode_comb_fx( index2 - table_no_cv_fx[im1], &x_lvq[LATTICE_DIM], im1 );

        scales_mslvq[1] = p_scales[add( i_mult2( mode_glb, len_scales ), add( MAX_NO_SCALES, idx_scale ) )];



        move16();

    }

    /* Why is x_lvq not multiplied with scales_mslvq?  */

lib_com/rom_com_fx.c

+20 −11
Original line number Diff line number Diff line
@@ -27446,7 +27446,8 @@ const Word16 scales_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors Q11*/ 
        /* 37*/                                 /* mode 2 V WB*/

        { 3356, 0, 0, 2494, 4425, 0 },          /* 17 */

        { 2633, 5009, 0, 2887, 0, 0 },          /* 18 */

        { 2224, 3538, 7696, 2494, 4425, 0 },    /* 22 */

        //{ 2224, 3538, 7696, 2494, 4425, 0 },    /* 22 */

        { 2224, 3539, 7696, 2494, 4426, 0 },    /* 22 */

        { 2119, 3225, 9861, 2494, 4425, 0 },    /* 23 */

        { 1974, 3139, 10121, 2494, 4425, 0 },   /* 24 */

        { 1722, 2453, 4059, 2494, 4425, 0 },    /* 25 */
@@ -27479,7 +27480,8 @@ const Word16 scales_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors Q11*/ 
        /* 32 (31.995) */                       /* G WB*/

        { 2424, 3706, 5654, 0, 0, 0 },          /* 12 (11.925) */

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

        { 2424, 3706, 5654, 3174, 0, 0 },       /* 19 (18.745) */

        //{ 2424, 3706, 5654, 3174, 0, 0 },     /* 19 (18.745) */

        { 2425, 3707, 5655, 3174, 0, 0 },       /* 19 (18.745) */

        { 2424, 3706, 5654, 3313, 0, 0 },       /* 20 (19.838) */

        { 2177, 3557, 6113, 3313, 0, 0 },       /* 21 (20.910) */

        { 2207, 3737, 6475, 3008, 4605, 0 },    /* 22 (21.985) */
@@ -27520,7 +27522,8 @@ const Word16 scales_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors Q11*/ 
        { 2215, 3606, 8046, 2439, 4528, 0 },    /* 22 */

        { 2084, 3143, 5750, 2439, 4528, 0 },    /* 23 */

        { 1933, 3024, 5658, 2439, 4528, 0 },    /* 24 */

        { 1863, 3571, 6793, 2439, 4528, 0 },    /* 25 */

        //{ 1863, 3571, 6793, 2439, 4528, 0 },    /* 25 */

        { 1864, 3572, 6793, 2439, 4528, 0 },    /* 25 */

        { 1884, 3375, 6283, 1984, 3446, 8095 }, /* 28 */

        { 1513, 2275, 5517, 1800, 2889, 4720 }, /* 31 */

        { 1452, 2113, 5564, 1658, 2549, 3735 },
@@ -27549,11 +27552,12 @@ const Word16 scales_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors Q11*/ 
        { 2099, 1452, 3545, 2521, 4706, 7946 }, /* (32.996) 33 */

        { 1980, 1460, 3385, 3768, 2252, 5793 }, /* (33.994) 34 */

        { 2025, 1429, 3278, 2224, 4022, 5902 }, /* (34.954) 35 */

        { 1233, 1780, 2904, 2588, 1564, 4542 },

        { 1233, 1780, 2904, 2588, 1564, 4542 }, /* */

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

        // { 1746,            3622, 9062, 2048, 2048, 2048, },

        {

            1746,

            3622,

            1747,

            3623,

            9062,

            2048,

            2048,
@@ -27837,9 +27841,12 @@ const Word16 scales_p_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors 20 modes Q11 */ 
        { 1327, 2107, 3760, 1406, 2166, 3891 },

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

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

        { 2594, 5068, 0, 3315, 0, 0 },          /* 19 (18.572) */

        { 2076, 3338, 5046, 2631, 4405, 0 },    /* 23 (22.773) */

        { 1828, 2846, 4739, 3000, 4708, 0 },    /* 24 (23.999) */

        //{ 2594, 5068, 0, 3315, 0, 0 },          /* 19 (18.572) */

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

        //{ 2076, 3338, 5046, 2631, 4405, 0 },    /* 23 (22.773) */

        { 2077, 3338, 5046, 2632, 4405, 0 },    /* 23 (22.773) */

        //{ 1828, 2846, 4739, 3000, 4708, 0 },    /* 24 (23.999) */

        { 1829, 2847, 4739, 3000, 4708, 0 },    /* 24 (23.999) */

        { 1904, 2869, 4403, 2621, 4616, 0 },    /* 25 (24.992) */

        { 1828, 2846, 4739, 2613, 4517, 6111 }, /* 27 (26.962) */

        { 1828, 2846, 4739, 2121, 3371, 5060 }, /* 28 (27.835) */
@@ -27876,7 +27883,8 @@ const Word16 scales_p_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors 20 modes Q11 */ 
        /* 35 (34.994) */                        /* G WB*/

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

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

        { 2115, 4249, 8886, 2906, 5009, 0 },     /* 22 (21.985) */

        //{ 2115, 4249, 8886, 2906, 5009, 0 },   /* 22 (21.985) */

        { 2116, 4250, 8886, 2906, 5009, 0 },     /* 22 (21.985) */

        { 2017, 3672, 12216, 2623, 4759, 0 },    /* 23 (22.773) */

        { 1804, 3289, 14325, 2906, 5009, 0 },    /* 24 (23.932) */

        { 1728, 3239, 14376, 2623, 4759, 0 },    /* 25 (24.955) */
@@ -27911,7 +27919,8 @@ const Word16 scales_p_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors 20 modes Q11 */ 
        { 1128, 1568, 2285, 1972, 1427, 2709 }, /* (38.973) 39 */

        { 1075, 1576, 2197, 1669, 2533, 1161 },

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

        { 2191, 3667, 7993, 3274, 0, 0 },       /* 21 */

        //{ 2191, 3667, 7993, 3274, 0, 0 },       /* 21 */

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

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

        { 1597, 2394, 5109, 2570, 4689, 0 },    /* 26 */

        { 2201, 1480, 4835, 2273, 4016, 7149 }, /* 30 */

lib_enc/mslvq_enc_fx.c

+1 −2
Original line number Diff line number Diff line
@@ -154,8 +154,7 @@ Word32 mslvq_fx( 
    }



    /* first subvector */

    dist = quantize_data_fx( pTmp, w, quant, cv_out, idx_lead, idx_scale,

                             p_sigma, p_inv_sigma, p_scales, p_no_lead );

    dist = quantize_data_fx( pTmp, w, quant, cv_out, idx_lead, idx_scale, p_sigma, p_inv_sigma, p_scales, p_no_lead );



    IF( LT_16( pred_flag, 5 ) )

    {