Commit 46795370 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'ivas_evs_updates' into 'main' 

Fix for EVS test failures

See merge request !228
parents e87ba83e d411e5e7

lib_com/fd_cng_com_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -2461,9 +2461,11 @@ void SynthesisSTFT ( 
    scale = 0;

    BASOP_rfft(fftBuffer, hFdCngCom->fftlen, &scale, 1);

    fftBufferExp = add(fftBufferExp, scale);

#ifdef EVS_FLOAT

#ifdef IVAS_FLOAT_FIXED

    hFdCngCom->fftBuffer_exp = fftBufferExp;

#endif

#endif // EVS_FLOAT

    fftBufferExp = add(fftBufferExp, hFdCngCom->fftlenShift);



    /* Perform overlap-add */

lib_com/prot_fx2.h

+4 −0
Original line number Diff line number Diff line
@@ -7401,6 +7401,10 @@ void generate_comfort_noise_dec_hf_ivas_fx( 
   Decoder_State *st_fx                /* i/o: encoder state structure */

 );



 void bandwidth_switching_detect_ivas_fx(

   Decoder_State *st_fx                /* i/o: encoder state structure */

 );



 void bw_switching_pre_proc_fx(

   const Word16 *old_syn_12k8_16k_fx,     /* i  : ACELP core synthesis at 12.8kHz or 16kHz */

   Decoder_State *st_fx                 /* i/o: decoder state structure     */

lib_dec/FEC_pitch_estim_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -63,12 +63,16 @@ void FEC_pitch_estim_fx( 
#else

    tmp16k2 = shl(tmp16k1,1);                               /*Q6 1.4f * old_pitch_buf[2*NB_SUBFR16k-1]*/

#endif

#ifdef EVS_FLOAT

#if 1//def IVAS_CODE

    test(); test();

    IF (EQ_16(last_core, HQ_CORE) || EQ_16(last_core, TCX_20_CORE)  || EQ_16(last_core, TCX_10_CORE))

#else

    IF( EQ_16(last_core,HQ_CORE))

#endif

#else

    IF( EQ_16( last_core, HQ_CORE ) )

#endif // EVS_FLOAT

    {

        *bfi_pitch = pitch_buf[shr(L_frame,6)-1];

        move16();

lib_dec/LD_music_post_filter_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -783,11 +783,15 @@ void Prep_music_postP_fx( 
    /*------------------------------------------------------------*

     * Resetting some memories in case of switching

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

#ifdef EVS_FLOAT

#if 1//def _DIFF_FLOAT_FIX_

    IF( EQ_16(last_core,HQ_CORE) || EQ_16(last_core, TCX_20_CORE) || EQ_16(last_core, TCX_10_CORE) )

#else

    IF(EQ_16(last_core, HQ_CORE))

#endif

#else

    IF( EQ_16( last_core, HQ_CORE ) )

#endif // EVS_FLOAT

    {

        set16_fx( filt_lfE, 4096, DCT_L_POST );

        set16_fx( LDm_enh_lp_gbin, 16384, VOIC_BINS_HR );

lib_dec/TonalComponentDetection_fx.c

+4 −1
Original line number Diff line number Diff line
@@ -1029,8 +1029,11 @@ static void findTonalComponents( 
                        }

                        /* Side lobe increase must be 2 times smaller than the decrease to the foot */

                        /* Eq. to 2.0f*powerSpectrum[lowerIdx-1]/powerSpectrum[lowerIdx] > powerSpectrum[lowerIdx]/powerSpectrum[j] */

                        /*IF (GT_32(  Mpy_32_32(L_shl(powerSpectrum[upperIdx+1], 1), powerSpectrum[j]),    Mpy_32_32(powerSpectrum[upperIdx], powerSpectrum[upperIdx])))*/

#ifdef EVS_FLOAT

                        IF( GT_64( W_mult_32_32( L_shl( powerSpectrum[upperIdx + 1], 1 ), powerSpectrum[j] ), W_mult_32_32( powerSpectrum[upperIdx], powerSpectrum[upperIdx] ) ) )

#else

                        IF( GT_32( Mpy_32_32( L_shl( powerSpectrum[upperIdx + 1], 1 ), powerSpectrum[j] ), Mpy_32_32( powerSpectrum[upperIdx], powerSpectrum[upperIdx] ) ) )

#endif // EVS_FLOAT

                        {

                            BREAK;

                        }