Commit 2a64f975 authored by Arash Azizi's avatar Arash Azizi
Browse files

issue: 2557 Further attempts at making ivas function harmonized

parent 7173b609

lib_dec/fd_cng_dec_fx.c

+29 −2
Original line number Diff line number Diff line
@@ -3572,8 +3572,17 @@ void generate_comfort_noise_dec_hf_ivas_fx( 
        cngNoiseLevelExp = add( cngNoiseLevelExp, sn );

        move16();

    }



#ifndef FIX_BASOP_2457_HARM_GEN

    randGaussExp = CNG_RAND_GAUSS_SHIFT + 1;

#else

    IF(EQ_16(st->element_mode , EVS_MONO )) {

        randGaussExp = CNG_RAND_GAUSS_SHIFT;

    }

    ELSE{

        randGaussExp = CNG_RAND_GAUSS_SHIFT + 1;

    }

#endif // !FIX_BASOP_2457_HARM_GEN



    move16();



    /*
@@ -3588,12 +3597,30 @@ void generate_comfort_noise_dec_hf_ivas_fx( 


        FOR( j = hFdCngCom->numCoreBands; j < hFdCngCom->regularStopBand; j++ )

        {

#ifdef FIX_BASOP_2457_HARM_GEN

            IF(EQ_16(st->element_mode, EVS_MONO)) {

                /* scaleCLDFB:  CLDFBinvScalingFactor_EXP + 1 */

                s = 0;

                move16();

                sqrtNoiseLevel = Sqrt32(L_shr(Mpy_32_16_1(*ptr_level, scaleCLDFB), sn), &s); /*Q31 - s*/

            }

#endif // FIX_BASOP_2457_HARM_GEN

            FOR( i = 0; i < hFdCngCom->numSlots; i++ )

            {

#ifndef FIX_BASOP_2457_HARM_GEN

                /* scaleCLDFB:  CLDFBinvScalingFactor_EXP + 1 */

                s = 0;

                move16();

                sqrtNoiseLevel = Sqrt32(L_shr(Mpy_32_16_1(*ptr_level, scaleCLDFB), sn), &s); /*Q31 - s*/

#else

                IF(NE_16(st->element_mode, EVS_MONO)) {

                    /* scaleCLDFB:  CLDFBinvScalingFactor_EXP + 1 */

                    s = 0;

                    move16();

                    sqrtNoiseLevel = Sqrt32(L_shr(Mpy_32_16_1(*ptr_level, scaleCLDFB), sn), &s); /*Q31 - s*/

                }

#endif // FIX_BASOP_2457_HARM_GEN





                IF( cng_coh_flag )

                {