Commit 79f3351a authored by vaillancour's avatar vaillancour
Browse files

remove IVAS version of comp_and_apply

parent 8c4042de

lib_com/gs_gains_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ void Comp_and_apply_gain_fx( 


    return;

}

#ifndef FIX_2338_HARM_GSC_GAIN_COMP



void Comp_and_apply_gain_ivas_fx(

    Word16 exc_diffQ[],      /* i/o: Quantized excitation                  */
@@ -234,7 +235,7 @@ void Comp_and_apply_gain_ivas_fx( 


    return;

}



#endif



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

/* FUNCTION : Ener_per_band_comp_fx()                                     */

lib_com/gs_noisefill_fx.c

+5 −3
Original line number Diff line number Diff line
@@ -1352,9 +1352,10 @@ void highband_exc_dct_in_ivas_fx( 
            move16();

        }

    }



#ifndef FIX_2338_HARM_GSC_GAIN_COMP

    IF( EQ_16( element_mode, EVS_MONO ) )

    {

#endif

        Comp_and_apply_gain_fx( exc_diffQ, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 0, Qexc_diffQ, *Q_exc );



        IF( exc_wo_nf != NULL )
@@ -1362,6 +1363,7 @@ void highband_exc_dct_in_ivas_fx( 
            Comp_and_apply_gain_fx( exc_wo_nf, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 1, Qexc_diffQ, *Q_exc );

            Vr_add( exc_dct_in, exc_wo_nf, exc_wo_nf, L_frame );

        }

#ifndef FIX_2338_HARM_GSC_GAIN_COMP

    }

    ELSE

    {
@@ -1369,7 +1371,7 @@ void highband_exc_dct_in_ivas_fx( 
        move16();

        Word16 Q_old = *Q_exc;

        move16();

        Comp_and_apply_gain_ivas_fx( exc_diffQ, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 0, Qexc_diffQ, Q_exc );

        Comp_and_apply_gain_ivas_fx( exc_diffQ, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 0, Qexc_diffQ, Q_exc );                                 FIX_2338_HARM_GSC_GAIN_COMP



        IF( exc_wo_nf != NULL )

        {
@@ -1392,7 +1394,7 @@ void highband_exc_dct_in_ivas_fx( 
            Scale_sig( exc_dct_in, L_frame, sub( *Q_exc, Q_old ) );

        }

    }



#endif

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

     * add the correction layer to the LF bins,

     * and add the quantized pulses or the noise for the higher part of the spectrum

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ 
#define FIX_2315_AGC_MEMORY_RESET                       /* VA: basop issue 2315: fix reset of the AGC memory */

#define FIX_2312_CONDITION_MISSING_GSC_DEC_LR           /* VA: basop issue 2297: addition of condition missing in the GSC gain decoder at low-rate */

#define FIX_2313_HF_RESET_16KHZ                         /* VA: basop issue 2313: Call hf_synth_reset_fx() also for 16 kHz output_Fs */



#define FIX_2338_HARM_GSC_GAIN_COMP                     /* VA: basop issue 2338: harmonization of band gain computation for both EVS and IVAS */

/* ##################### End NON-BE switches ########################### */



/* ################## End MAINTENANCE switches ######################### */

lib_com/prot_fx.h

+2 −2
Original line number Diff line number Diff line
@@ -1764,7 +1764,7 @@ void Comp_and_apply_gain_fx( 
    const Word16 ReUseGain,  /* i  : Reuse the gain in Ener_per_bd_yQ     */

    Word16 Qexc_diff,

    Word16 Q_exc );













#ifndef FIX_2338_HARM_GSC_GAIN_COMP















void Comp_and_apply_gain_ivas_fx(















    Word16 exc_diffQ[],      /* i/o: Quantized excitation                  */















    Word16 Ener_per_bd_iQ[], /* i  : Target ener per band              Q13 */









@@ -1773,7 +1773,7 @@ void Comp_and_apply_gain_ivas_fx(













    const Word16 ReUseGain,  /* i  : Reuse the gain in Ener_per_bd_yQ      */















    Word16 Qexc_diff,















    Word16 *Q_exc );

























#endif















void pre_echo_att_fx(















    Word32 *Last_frame_ener_fx,      /* i/o: Energy of the last frame         2*Q_new+1*/















    Word16 *exc_fx,                  /* i/o: Excitation of the current frame  Q_new*/