Updates from main

#define MIN_BRATE_SWB_SCE                       ACELP_9k60                  /* min. SCE bitrate where SWB is supported */

#define MIN_BRATE_SWB_STEREO                    IVAS_13k2                   /* min. stereo bitrate where SWB is supported */

#define MIN_BRATE_FB_STEREO                     IVAS_32k                    /* min. SCE and stereo bitrate where FB is supported */

#ifdef ISM_FB

#ifdef ISM_FB_16k4

#define MIN_BRATE_FB_ISM                        16000                       /* min. SCE bitrate where FB is supported in ISM format */

#else

#define MIN_BRATE_FB_ISM                        24000                       /* min. SCE bitrate where FB is supported in ISM format */

#endif

#endif

#define MIN_TDM_BRATE_WB_TBE_1k05               12000                       /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */

#define MIN_BRATE_WB_TBE_1k05                   9650                        /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */

#define PARAM_MC_MAX_BAND_ABS_COV_DEC           10

#define PARAM_MC_ENER_LIMIT_INTRAFRAME          (1.5f)

#define PARAM_MC_ENER_LIMIT_INTERFRAME          (2.0f)

#ifdef FIX_563_PARAMMC_LIMITER

#define PARAM_MC_ENER_LIMIT_MAX_DELTA_FAC       (15.0f)

#endif

#ifdef FIX_580_PARAMMC_ENER_BURSTS

#define PARAM_MC_NUM_ATTACK_ILD_THRESH          (3)

#endif

#define PARAM_MC_LFE_ON_THRESH                  (8000.0f)

#define PARAM_MC_BAND_TO_MDCT_BAND_RATIO        16                          /* Ratio of resolution of CLDFB Bands to MDCT Bands */

#define PARAM_MC_SLOT_ENC_NS                    2500000L

#define BETA_ISM_LOW_IMP    0.6f

#define BETA_ISM_MEDIUM_IMP 0.8f

#ifdef FIX_562_ISM2_64KBPS

#define MAX_BRATE_TCX_32k 48000

#endif

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

            bits_CoreCoder[ch] = tmp;

        }

#ifdef FIX_562_ISM2_64KBPS

        /* limitaton to avoid too high bitrate in one active TCX channel */

        if ( element_brate[0] >= SCE_CORE_16k_LOW_LIMIT && element_brate[0] <= IVAS_32k )

        {

                bits_CoreCoder[ch] = tmp;

            }

        }

#endif

        if ( diff > 0 )

        {

        hParamIsm->last_el_sgn[i] = 1;

    }

#ifdef FIX_549_DMX_GAIN

    hParamIsm->last_dmx_gain = 1.0f;

    set_f( hParamIsm->last_cardioid_left, 1.0f, MAX_NUM_OBJECTS );

#endif

    return;

}

);

#ifdef FIX_572_LFE_LPF_ENC

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

 * LFE encoder low pass filter prototypes

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

    float data_lfe_ch[],                                        /* i/o: LFE signal                              */

    const int16_t input_frame                                   /* i  : input frame length per channel          */

);

#endif

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

    int16_t noisy_speech_buffer[PARAM_ISM_HYS_BUF_SIZE];

    int16_t flag_equal_energy;

#ifdef FIX_549_DMX_GAIN

    float last_dmx_gain;

    float last_cardioid_left[MAX_NUM_OBJECTS];

#endif

} PARAM_ISM_CONFIG_DATA, *PARAM_ISM_CONFIG_HANDLE;

#define VLBR_20MS_MD                                    /* Dlb: SBA VLBR 20ms Optimization*/

#define SBA_MODE_CLEANUP_2                              /* Dlb : changes part of fix issue #523 for unused signaling bit in SBA SID*/

#define FIX_137_SID_MD_BITS                             /* Dlb: Fix issue #137 , SID bitrate mismatch correction */

#define FIX_563_PARAMMC_LIMITER                         /* FhG: issue 563: fix ILD limiter when coming from silence w/o transient set             */

#define FIX_560_VAD_FLAG                                /* Eri: Issue 560 - VAD flag issue for unified stereo */

#define FIX_549_DMX_GAIN                                /* FhG: issue 549: ParamISM output too quiet */

#define FIX_470_MASA_JBM_EXT                            /* Nokia: Issue 470, fix MASA EXT output with JBM */

#define ISM_FB                                          /* issue 556: change SWB to FB coding in 1ISM at 24.4 kbps */

#define FIX_558_PLC_DISCONT                             /* FhG: issue 558: fix discontinuities in DFT Stereo when switching from TCX concealment to ACELP */

#define FIX_564                                         /* Nokia: Issue 564: Fix gains in JBM path for SBA with parametric binaural renderer */

#define FIX_566_2DIR_MASA_384K                          /* Nokia: Issued 566:  Bugfix in 384k MASA metadata encoding of second direction */

#define FIX_568_ISM_BITRATE_SWITCHING                   /* Philips: Issue 568: Bugfix for renderer re-initialization by ISM and bitrate switching */

#define FIX_565_SBA_BURST_IN_FEC                        /* VA: Issue 565: Fix noise burst during FEC, due to wrong total_brate initialization */

#define FIX_562_ISM2_64KBPS                             /* VA: issue 562: fix ISM2 at 64kbps issue */

#define FIX_559_EXTL_IGF_MISMATCH                       /* VA: issue 559: fix mismatch between st->extl and st->igf observed as crash in PlanarSBA bitrate switching */

#define FIX_571_REVERB_NOT_ACTIVATED_ISM                /* Philips: Issue 571: Reverb not activated for discrete and parametric ISM */

#define FIX_572_LFE_LPF_ENC                             /* FhG: issue 572: always apply the low pass filter to the LFE channel */

#define FIX_QMETA_SID_5k2                               /* Nokia: Issue 137: enable using full 5.2k bitrate in MASA SID */

#define FIX_578_PARAMMC_ILD_BS                          /* FhG: Issue 578: transmitt also center ILD in band 0 when LFE is active in 3TC ParamMC */

#define FIX_UNCLR_ISSUE                                 /* VoiceAge: issue 574: Fix UNCLR mis-classifications in noisy speech stereo */

#define FIX_TCX_LOWRATE_LIMITATION                      /* VA: issue 577: TCX bitrate limitation only when DEBUGGING is active */

#define ISM_FB_16k4                                     /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */

#define FIX_580_PARAMMC_ENER_BURSTS                     /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */

#define FIX_550_FIRST_FRAME_ACCESS                      /* Eri: Issue 550: TD Object renderer: first frame accesses wrong transport channel offsets */

#define FIX_550_FIRST_FRAME_ACCESS_ALT                  /* Eri: Issue 550: Should be merged with FIX_550_FIRST_FRAME_ACCESS above, or accepted at the same time */

#define FIX_569_TD_FILTER_LENGTH                        /* Eri: Issue 569: If an HRTF binary file exceeds the SFX_SPAT_BIN_MAX_FILTER_LENGTH the decoder crashes. This truncates the filter when generated from the model.  */

#define FIX_595_SHL_NOGLOB                              /* FhG: Issue 595: compilation with BASOP_NOGLOB disabled */

#define UPDATE_FASTCONV_SBA_FILTER                      /* Dlb: Issue 584: Update SBA CLDFB-Domain HRTFs */

#define FIX_570_SF_EXT_ORIENTATION

#define FIX_593_STL_INCLUDE                             /* FhG: Issue 593: correct include of stl.h in lib_enc/ivas_stereo_eclvq_enc.c */

#define FIX_583_CLANG_TRANS_DET                         /* FhG: Issue 583: clang left shift on ramp_up_flag in transient detector */

#define FIX_280_PLANAR_CP                               /* Dlb : fix issue 28 : remove planarCP=1 related code*/

#define CODE_CLEAN_UP_DIRAC                             /* Dlb : code clean up*/

#define COVARIANCE_MEMORY_OPT                           /* Dlb : Issue 231: define SPAR covariance buffers in stack instead of inter-frame heap */

#define NONBE_FIX_589_JBM_TC_OFFSETS                    /* FhG: issue 589: wrong offset into the TC buffers is used in some rendering paths in the JBM main rendering function */

#define FIX_MEM_REALLOC_IND_LIST                        /* VA: issue 601: failure of the automatic memory re-allocation mechanism when ind_list[] buffer is depleted in MASA mode with 2 TC*/

#define FIX_581_CLANG_OFFSET_TO_NULL                    /* FhG: issue 581: fix CLANG error about applying an offset to a NULL pointer */

#define JBM_PARAMUPMIX                                  /* Dlb: Issue 471: Integrate the Multichannel Parametric Upmix into the JBM path */

#define FIX_582_INDEX_OUT_OF_BOUNDS_SNS_AVQ_DEC         /* FhG: fix an undefined behaviour error in SNS AVQ decoding */

#define FIX_614_ADD_TO_NULL_PTR_DIRAC_SETUP             /* FhG: Issue 614: prevent adding to a null pointer in dirac setup code */

#define NONBE_FIX_539_MASA_384K_CHIRP                   /* Nokia: issue 539, puts the normalization of the energy ratios at the correct place, affect MASA 384k only */

/* Fixes for bugs found during split rendering contribution development */

#define REND_STATIC_MEM_OPT                             /* Dlb: Static memory optimisation for external renderer */

#define EULER2QUAT_FIX                                  /* Dlb: Fix for Euler2Quat()/Quat2EulerDegree functions */

#define SBA_CREND_ROT_OPT                               /* Dlb: Optimisation for rotateFrameSba() used for SHD rotations in external renderer */

#define TD_TDREND_FIX_NULLPTR_ACCESS                    /* FhG: avoid nullptr access in ivas_rend_TDObjRendOpen */

#define TD_REND_FIX_DIV_BY_ZERO                         /* FhG: avoid division by zero in sincResample fn */

#define RENAME_GWLPR                                    /* FhG: Rename clashing symbol */