Commit ab51f504 authored by vaclav's avatar vaclav
Browse files

Merge branch 'cleanup_ivas-float-update_20251015' into 'ivas-float-update'

Cleanup ivas-float-update 20251015 step 2

See merge request !2400
parents e8ee3eab 63a72254
Loading
Loading
Loading
Loading
+2 −16
Original line number Diff line number Diff line
@@ -149,31 +149,18 @@

/* #################### End DEBUGGING switches ############################ */

/* ################### Start FIXES switches ########################### */
#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */

/* ################### Start FIXES switches ########################### */



/* #################### End FIXES switches ############################ */

#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */
#define FIX_1995_REVERB_INIT                            /* issue 1995: Fix use-of-uninitialized-value in ivas_binaural_reverb_init() */

/* #################### Start BASOP porting switches ############################ */

#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */
#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */

#define CHECK_BE_USING_OLD_ROM_TABLES_ONLY
#ifdef CHECK_BE_USING_OLD_ROM_TABLES_ONLY
#define USE_NEW_CREND_ROM_TABLE
#ifdef USE_NEW_CREND_ROM_TABLE
#define USE_NEW_REVERB_ROM_TABLES
#endif
#define USE_NEW_FASTCONV_PARAMBIN_ROM_TABLES
#define USE_NEW_TDREND_ROM_TABLES
#endif

#define FIX_1320_STACK_CPE_DECODER                      /* VA: issue 1320: Optimize the stack memory consumption in the CPE decoder */
#define NONBE_1328_FIX_NON_LINEARITY                    /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0  */
#define FIX_1320_STACK_CPE_DECODER                      /* VA: issue 1320: Optimize the stack memory consumption in the CPE decoder */
@@ -185,7 +172,6 @@
#define NONBE_FIX_1376_MDCT_CONCEALMENT                 /* FhG: fix concealment artifact in MDCT Stereo with DTX, in case transition frame gets lost */
#define NONBE_1377_REND_DIRATT_CONF                     /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */
#define FIX_1377_HANDLE_ERROR_CODE                      /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */
#define FIX_ISSUE_2008_MISSING_CODE_FROM_PORTING        /* FhG: Issue 2008: Code deleted while porting float-main MR !1504 (BASOP issue 1565)*/
#define FIX_1053_REVERB_RECONFIGURATION
#define FIX_1179_USAN_PHASEECU                          /* Eri: issue 1179:  better handling of 16 bit wrap around for very long(>200ms) FER-bursts   */
#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 */
+0 −2
Original line number Diff line number Diff line
@@ -729,10 +729,8 @@ void stereo_dft_enc_compute_itd(
        grand_dot_prod_img += xcorr[2 * i + 1];
        xcorr_abs[i] = sqrtf( xcorr[2 * i] * xcorr[2 * i] + xcorr[2 * i + 1] * xcorr[2 * i + 1] );

#ifdef FIX_ISSUE_2008_MISSING_CODE_FROM_PORTING
        prod_LL = prod_L;
        prod_RR = prod_R;
#endif

        if ( j == SFM_PROD_GRP || i == NFFT_mid - 1 )
        {
+0 −8
Original line number Diff line number Diff line
@@ -1899,11 +1899,7 @@ ivas_error ivas_binaural_reverb_init(
    }
    else
    {
#ifdef FIX_1995_REVERB_INIT
        for ( bin = 0; bin < numBins; bin++ )
#else
        for ( bin = 0; bin < CLDFB_NO_CHANNELS_MAX; bin++ )
#endif
        {
            revTimes[bin] = defaultTimes[bin];
            revEne[bin] = defaultEne[bin];
@@ -1911,11 +1907,7 @@ ivas_error ivas_binaural_reverb_init(
        preDelay = 10;
    }

#ifdef FIX_1995_REVERB_INIT
    for ( bin = 0; bin < numBins; bin++ )
#else
    for ( bin = 0; bin < CLDFB_NO_CHANNELS_MAX; bin++ )
#endif
    {
        /* Adjust the room effect parameters when the reverberation time is less than a threshold value, to avoid
           spectral artefacts with the synthetic reverberator. */
+1 −251122

File changed.

Preview size limit exceeded, changes collapsed.

+1 −47479

File changed.

Preview size limit exceeded, changes collapsed.

Loading