Commit 1ceb786f authored by vaillancour's avatar vaillancour
Browse files

fix BE issue when switch are deactivated

parent 8c16cd26

lib_enc/enc_uv_fx.c

+4 −3
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ void encod_unvoiced_fx( 
    Word16 y1[L_SUBFR];      /* Filtered adaptive excitation                   */

    Word16 code2[L_SUBFR];   /* Gaussian excitation                            */

    Word16 y22[L_SUBFR];     /* Filtered Gaussian excitation                   */

    Word16 prm_t[2 * NPRM_DIV], *prm = prm_t;

   // Word16 prm_t[2 * NPRM_DIV], *prm = prm_t;

    const Word16 *p_Aw_fx, *p_Aq_fx; /* pointer to LP filter coeff. vector */

    Word32 norm_gain_code_fx;

    ACELP_config *acelp_cfg;
@@ -323,6 +323,7 @@ void encod_unvoiced_fx( 
        Copy( &res_fx[i_subfr], &exc_fx[i_subfr], L_SUBFR ); /* Q_new */

#ifdef USE_UC_EVS

        IF( st_fx->element_mode > EVS_MONO )

#endif

        {



            find_targets_ivas_fx( speech_fx, hLPDmem->mem_syn, i_subfr, &hLPDmem->mem_w0, p_Aq_fx,
@@ -331,13 +332,12 @@ void encod_unvoiced_fx( 
            q_h1 = sub( 14, norm_s( h1_fx[0] ) );

            Copy_Scale_sig( h1_fx, h2_fx, L_SUBFR, sub( 11, q_h1 ) );

            Scale_sig( h1_fx, L_SUBFR, sub( 14, q_h1 ) );

            //Scale_sig( h1, L_SUBFR, add( sub( 14, q_h1 ), shift ) ); /* set h1[] in Q14 with scaling for convolution Q14*/



            /* scaling of xn[] to limit dynamic at 12 bits */

            Scale_sig( xn_fx, L_SUBFR, shift ); // Q_new - 1 + shift

        }

#ifdef USE_UC_EVS

        else

#endif

        {

            find_targets_fx( speech_fx, hLPDmem->mem_syn, i_subfr, &hLPDmem->mem_w0, p_Aq_fx,

                             res_fx, L_SUBFR, p_Aw_fx, st_fx->preemph_fac, xn_fx, cn_fx, h1_fx );
@@ -348,6 +348,7 @@ void encod_unvoiced_fx( 
            /* scaling of xn[] to limit dynamic at 12 bits */

            Scale_sig( xn_fx, L_SUBFR, shift );

        }

#endif

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

         * Unvoiced subframe processing

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