Commit 5827f1cb authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'float_dependencies_cleanup_4' into 'main' 

Float dependencies cleanup

See merge request !272
parents e6025b15 f1433d19

lib_com/arith_coder_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ Word32 expfp( /* o: Q31 */ 
 * Returns: *pout1 = ( (base/65536)^(2*exp - 1) ) * 65536

 *          *pout2 = ( (base/65536)^(2*exp + 1) ) * 65536

 *

 * NOTE: This function must be in sync with ari_decode_14bits_pow() */

 * NOTE: This function must be in sync with ari_decode_14bits_pow_fx() */

void powfp_odd2(

    const  Word16 base,     /* Q15 */

    const Word16 exp,      /* Q0  */

lib_com/edct_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 




#include "math_32.h"

#ifdef  IVAS_FLOAT_FIXED







static Word16 get_edxt_factor( Word16 length ) /* Returns value of sqrtf(2.f/length) in Q15 */

{
@@ -815,3 +818,4 @@ void edxt_fx( 
    }

    return;

}

#endif
 
 No newline at end of file

lib_com/fd_cng_com.c

+5 −5
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ void initFdCngCom_flt( 
    HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */

    const float scale )

{

#if (defined EVS_FLOAT) || !(defined IVAS_FLOAT_FIXED)

#ifndef IVAS_FLOAT_FIXED

    /* Calculate FFT scaling factor */

    hFdCngCom->scalingFactor_flt = 1 / ( scale * scale * 8.f );
@@ -133,7 +133,7 @@ void initFdCngCom_flt( 
    hFdCngCom->seed2 = 1;

    hFdCngCom->seed3 = 2;

    hFdCngCom->CngBitrate = -1;

#if (defined EVS_FLOAT) || !(defined IVAS_FLOAT_FIXED)

#ifndef IVAS_FLOAT_FIXED

    /* Initialize noise estimation algorithm */

    set_f( hFdCngCom->periodog_flt, 0.0f, PERIODOGLEN );

    mhvals_flt( MSNUMSUBFR * MSSUBFRLEN, &( hFdCngCom->msM_win_flt ) );
@@ -149,7 +149,7 @@ void initFdCngCom_flt( 
    hFdCngCom->offsetflag = 0;

    hFdCngCom->msFrCnt = MSSUBFRLEN;

    hFdCngCom->msMinBufferPtr = 0;

#if (defined EVS_FLOAT) || !(defined IVAS_FLOAT_FIXED)

#ifndef IVAS_FLOAT_FIXED

    set_f( hFdCngCom->msAlphaCor_flt, 0.3f, 2 );



    hFdCngCom->coherence_flt = 0.5f;
@@ -836,7 +836,7 @@ static void getmidbands( 
    return;

}



#if (defined EVS_FLOAT) || !(defined IVAS_FLOAT_FIXED)

#ifndef IVAS_FLOAT_FIXED

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

 * AnalysisSTFT_flt()

 *
@@ -1065,7 +1065,7 @@ void SynthesisSTFT_fx( 
    return;

}

#endif

#if (defined EVS_FLOAT) || !(defined IVAS_FLOAT_FIXED)

#ifndef IVAS_FLOAT_FIXED

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

 * SynthesisSTFT_dirac_flt()

 *

lib_com/guided_plc_util.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ void getConcealedLP_flt( 
 *

 *

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

#if (defined EVS_FLOAT) || !(defined IVAS_FLOAT_FIXED)

#ifndef IVAS_FLOAT_FIXED

void RecLpcSpecPowDiffuseLc_flt(

    float *lspq,

    float *lsp_old,

lib_com/isf_dec_amr_wb.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
 *

 * Decoding of ISF parameters in AMR-WB IO mode

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

#if (defined EVS_FLOAT) || !(defined IVAS_FLOAT_FIXED)

#ifndef IVAS_FLOAT_FIXED

void isf_dec_amr_wb(

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

    float *Aq,         /* o  : quantized A(z) for 4 subframes              */