Commit 9eaa2e80 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

harmonize: use only one function

parent 3629b2cd

lib_enc/acelp_core_enc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ ivas_error acelp_core_enc_fx( 
                {

                    IF( st->hTdCngEnc != NULL )

                    {

#ifdef HARMONIZE_2539_cng_energy_

#ifdef HARMONIZE_2539_cng_energy

                        enr = cng_energy_fx( st->element_mode, st->bwidth, st->hDtxEnc->CNG_mode, st->hTdCngEnc->CNG_att_fx, exc_fx, st->L_frame, Q_new ); /* Q8 */

#else

                        enr = cng_energy_ivas_fx( st->element_mode, st->bwidth, st->hDtxEnc->CNG_mode, st->hTdCngEnc->CNG_att_fx, exc_fx, st->L_frame, Q_new ); /* Q8 */

lib_enc/fd_cng_enc_fx.c

+3 −2
Original line number Diff line number Diff line
@@ -1165,6 +1165,7 @@ void generate_comfort_noise_enc_fx( 




/*! r: CNG energy */

#ifndef HARMONIZE_2539_cng_energy

Word16 cng_energy_fx(

    const Word16 element_mode, /* i  : element mode                 Q0*/

    const Word16 bwidth,       /* i  : audio bandwidh               Q0*/
@@ -1289,7 +1290,7 @@ Word16 cng_energy_fx( 


    return enr;

}



#endif



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

 * cng_energy_ivas_fx()
@@ -1298,7 +1299,7 @@ Word16 cng_energy_fx( 
 *-------------------------------------------------------------------*/



/*! r: CNG energy */

#ifdef HARMONIZE_2539_cng_energy_

#ifdef HARMONIZE_2539_cng_energy

Word16 cng_energy_fx(

#else

Word16 cng_energy_ivas_fx(

lib_enc/prot_fx_enc.h

+1 −1
Original line number Diff line number Diff line
@@ -3896,7 +3896,7 @@ void writeLPCparam_fx( 
    const Word16 no_param_lpc,     /* i  : number of LPC parameters    */

    Word16 *nbits_lpc              /* o  : LPC bits written            */

);

#ifndef HARMONIZE_2539_cng_energy_

#ifndef HARMONIZE_2539_cng_energy

Word16 cng_energy_ivas_fx(

    const Word16 element_mode, /* i  : element mode                   */

    const Word16 bwidth,       /* i  : audio bandwidh                 */