Commit 061d61d0 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'ivas-float-update' into 2078_ref_portFlpMR1564_aeIdFileTests

parents 98acd0aa 7a2078e5

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ 
#define FIX_ISSUE_2008_MISSING_CODE_FROM_PORTING        /* FhG: Issue 2008: Code deleted while porting float-main MR !1504 (BASOP issue 1565)*/

#define ADJUST_MCT_CHANNELS_MAX                         /* FhG: set correct max mct channels constant*/

#define FIX_1053_REVERB_RECONFIGURATION

#define NONBE_1246_INF_COHERENCE_IN_HIGH_LEVEL_DTX      /* Ericsson: Issue 1246: High level input which triggers DTX can lead to numerical overflow in coherence calculation */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1113_EXTREND_ISAR                           /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */

#define FIX_938_COMPILER_WARNING                        /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */

lib_enc/ivas_stereo_cng_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -95,7 +95,11 @@ void stereo_dft_enc_sid_calc_coh( 
            for ( k = hStereoDft->band_limits[b]; k < hStereoDft->band_limits[b + 1]; k++ )

            {

                coh_weight = hStereoDft->DFT[0][2 * k] * hStereoDft->DFT[0][2 * k] + hStereoDft->DFT[0][2 * k + 1] * hStereoDft->DFT[0][2 * k + 1];

#ifdef NONBE_1246_INF_COHERENCE_IN_HIGH_LEVEL_DTX

                cohBand[b] += coh_weight * ( ( hStereoDft->xspec_smooth[2 * k] * hStereoDft->xspec_smooth[2 * k] + hStereoDft->xspec_smooth[2 * k + 1] * hStereoDft->xspec_smooth[2 * k + 1] ) / ( hStereoDft->Spd_L_smooth[k] * hStereoDft->Spd_R_smooth[k] + EPSILON ) );

#else

                cohBand[b] += coh_weight * ( hStereoDft->xspec_smooth[2 * k] * hStereoDft->xspec_smooth[2 * k] + hStereoDft->xspec_smooth[2 * k + 1] * hStereoDft->xspec_smooth[2 * k + 1] ) / ( hStereoDft->Spd_L_smooth[k] * hStereoDft->Spd_R_smooth[k] + EPSILON );

#endif

                coh_weight_sum += coh_weight;

            }

            if ( coh_weight_sum > 0 )