Commit ee29e329 authored by vaclav's avatar vaclav
Browse files

fix

parent 3241b0c1

lib_dec/fd_cng_dec_fx.c

+0 −15
Original line number Diff line number Diff line
@@ -955,11 +955,7 @@ Word16 ApplyFdCng_fx( 
                test();

                IF( NE_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->element_mode, IVAS_CPE_DFT ) )

                {

#ifdef REMOVE_EVS_DUPLICATES2

                    scalebands_fx( hFdCngDec->msNoiseEst, hFdCngDec->part_shaping, hFdCngDec->nFFTpart_shaping, hFdCngDec->midband_shaping, hFdCngDec->nFFTpart_shaping, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), hFdCngDec->bandNoiseShape, 1 );

#else

                    scalebands( hFdCngDec->msNoiseEst, hFdCngDec->part_shaping, hFdCngDec->nFFTpart_shaping, hFdCngDec->midband_shaping, hFdCngDec->nFFTpart_shaping, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), hFdCngDec->bandNoiseShape, 1 );

#endif

                }

                hFdCngDec->bandNoiseShape_exp = hFdCngDec->msNoiseEst_exp;

                move16();
@@ -1041,13 +1037,8 @@ Word16 ApplyFdCng_fx( 
                IF( LT_32( hFdCngCom->msFrCnt_init_counter, L_deposit_l( hFdCngCom->msFrCnt_init_thresh ) ) )

                {

                    /* At initialization, interpolate the bin/band-wise levels from the partition levels */

#ifdef REMOVE_EVS_DUPLICATES2

                    scalebands_fx( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband,

                                   hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 1 );

#else

                    scalebands( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband,

                                hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 1 );

#endif

                    *cngNoiseLevel_exp = hFdCngCom->sidNoiseEstExp;

                    move16();

                }
@@ -1063,14 +1054,8 @@ Word16 ApplyFdCng_fx( 
                    /* Interpolate the CLDFB band levels from the SID (partition) levels */

                    IF( GT_16( hFdCngCom->regularStopBand, hFdCngCom->numCoreBands ) )

                    {

#ifdef REMOVE_EVS_DUPLICATES2

                        scalebands_fx( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband,

                                       hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 0 );

#else

                        scalebands( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband,

                                    hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 0 );

#endif



                        *cngNoiseLevel_exp = hFdCngCom->sidNoiseEstExp;

                        move16();

                    }