Commit 03f3375f authored by vaclav's avatar vaclav
Browse files

fix EVS VBR modes

parent 3cf73563

lib_com/prot_fx.h

+0 −7
Original line number Diff line number Diff line
@@ -5380,13 +5380,6 @@ void lsf_end_dec_fx( 
    const Word16 tdm_lsfQ_PCh[M] /* i  : Q LSFs for primary channel                  Qx*/

);



void lsf_mid_dec_fx(

    Decoder_State *st_fx, /* i/o: decoder state structure              */

    Word16 lsp_new[],     /* i  : quantized LSPs from frame endS    Q15*/

    Word16 coder_type,    /* i  : Coder type                         Q0*/

    Word16 lsp_mid[]      /* o  : quantized LSPs                    Q15*/

);



void CNG_dec_fx(

    Decoder_State *st_fx,           /* i/o: State structure                          */

    const Word16 last_element_mode, /* i  : last element mode                    Q0  */

lib_com/rom_com_fx.c

+16 −5
Original line number Diff line number Diff line
@@ -27542,7 +27542,18 @@ const Word16 scales_fx[][MAX_NO_SCALES * 2] = /* 2 subvectors Q11*/ 
        { 2025, 1429, 3278, 2224, 4022, 5902 }, /* (34.954) 35 */

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

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

#ifdef FIX_2492_REMOVE_DUPLICATES_FOR_DECODE_INDEXES_VE

        {

            1747,

            3623,

            9062,

            2048,

            2048,

            2048,

        }, /* 17 */

#else

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

#endif

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

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

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

lib_dec/lsf_dec_fx.c

+14 −10
Original line number Diff line number Diff line
@@ -46,8 +46,11 @@ 
 * Local functions

 *-------------------------------------------------------------------*/



static void lsf_mid_dec_fx( Decoder_State *st_fx, const Word16 lsp_new[], const Word16 coder_type, Word16 lsp_mid[] );



static void dqlsf_CNG_fx( Decoder_State *st_fx, Word16 *lsf_q );





/*--------------------------------------------------------------------------------------*

* dqlsf_CNG_fx()

*
@@ -286,10 +289,10 @@ void lsf_dec_fx( 
        Copy( lsp_new, st_fx->lsp_old_fx, M ); /* Q15 */

        Copy( lsf_new, st_fx->lsf_old_fx, M ); /* Q2.56 */

    }

    {



    /* Mid-frame LSF decoding */

    lsf_mid_dec_fx( st_fx, lsp_new, coder_type, lsp_mid );

    }



    test();

    test();

    IF( !( st_fx->prev_bfi && ( EQ_16( coder_type, TRANSITION ) ) && ( EQ_16( tc_subfr, sub( st_fx->L_frame, L_SUBFR ) ) ) ) )
@@ -863,10 +866,11 @@ void lsf_end_dec_fx( 
/* RETURN ARGUMENTS :                                                     */

/* _ None                                                                 */

/*========================================================================*/

void lsf_mid_dec_fx(



static void lsf_mid_dec_fx(

    Decoder_State *st_fx,    /* i/o: decoder state structure              */

    Word16 lsp_new[],     /* i  : quantized LSPs from frame endS    Q15*/

    Word16 coder_type,    /* i  : Coder type                         Q0*/

    const Word16 lsp_new[],  /* i  : quantized LSPs from frame endS    Q15*/

    const Word16 coder_type, /* i  : Coder type                         Q0*/

    Word16 lsp_mid[]         /* o  : quantized LSPs                    Q15*/

)

{
@@ -876,10 +880,10 @@ void lsf_mid_dec_fx( 
    Word32 L_tmp;

    Word16 bad_spacing;

    const Word16 *ratio = NULL;



    bad_spacing = 0;

    move16();





    /* Convert LSPs to LSFs */

    lsp2lsf_fx( st_fx->lsp_old_fx, qlsf0, M, st_fx->sr_core );

    lsp2lsf_fx( lsp_new, qlsf1, M, st_fx->sr_core );