Commit 58f57de1 authored by multrus's avatar multrus
Browse files

Merge branch 'main' into 2003_fix_saturation_at_con_tcx

parents fc8a6961 74867d7d

.gitlab-ci/variables.yml

+1 −0
Original line number Diff line number Diff line
@@ -104,3 +104,4 @@ variables: 
      - 'peaq-enc-passthrough'

      - 'long-term-logs'

      - 'backup-long-term-logs'

      - 'test-long-self-test'

apps/renderer.c

+3 −0
Original line number Diff line number Diff line
@@ -1278,6 +1278,9 @@ int main( 
    {

        masaIds[i] = 0u;

    }

#ifdef NONBE_1377_REND_DIRATT_CONF

    IVAS_REND_SetObjectIDs( hIvasRend );

#endif



    for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )

    {

lib_com/common_api_types.h

+0 −1
Original line number Diff line number Diff line
@@ -343,7 +343,6 @@ typedef struct _IVAS_RENDER_CONFIG 
    Word16 directivity_fx[IVAS_MAX_NUM_OBJECTS * 3]; // has the following q-factor pattern: {6, 6, 15, 6, 6, 15, 6, 6, 15, 6, 6, 15}

    float distAtt[3];

    Word32 distAtt_fx[3]; /* {Q27, Q30, Q30} */



} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;



typedef struct

lib_com/options.h

+11 −0
Original line number Diff line number Diff line
@@ -92,6 +92,15 @@ 
#define FIX_1995_REVERB_INIT                                 /* VA/Nokia: issue 1995: Fix use-of-uninitialized-value in ivas_binaural_reverb_init() */

#define FIX_1996_MASKING_NOISE                               /* Dlb: Heavy precision loss in ola buffers causing discontinuity*/

#define FIX1998_APA_EXEC_SCALING                             /* FhG: fix scaling of apa_exec_ivas_fx(); avoid continuously worse scaling with previous data */

#define FIX2007_BASSPSFILTER_OVERFLOW                        /* FhG: use saturing operator, to avoid overflow in bass_psfilter_fx() */

#define FIX_ISSUE_2004_LPC_SHB_SAT                           /* Dolby: Issue 2004: prevent saturation of the LPC SHB filter */



#define FIX_2009_HIGH_NOISE_FLOOR_FOR_FX_DEC                 /* FhG: Corrected the q_input in the input of generate_masking_noise_dirac_ivas_fx() */

#define FIX_ISSUE_2013_MDCT_STEREO_DTX_DISCONTINUITIES       /* Eri/FhG: Issue 2013 fix for dtx discontinuities */

#define FIX_ISSUE_2013_MDCT_STEREO_FER_DISCONTINUITIES       /* Eri/FhG: Issue 2013 fix for FER discontinuities */

#define FIX_2000_NON_LINEARITY_OVERSHOOT                     /* Eri: Issue 2000: SWB TBE energy overshoot in non-linearity. Aligns with float */

#define FIX_2010_PREP_TBE_EXC                                /* FhG: fix issues with varying Q-values for code_preQ_fx[] */

#define FIX_2025_FDCNG_MULT                                  /* Nokia, FhG: Fix LB FDCNG noise introduced by changing mult to i_mult */



#define FIX_1962_FORMAT_CONV_SPECTRAL_DIFF                   /* FhG: Improved precision of targetEnergy in ivas_ls_setup_conversion_process_mdct_fx() */

#define FIX_2003_CON_TCX_OVERFLOW                            /* FhG: Use a dynamic scaling factor for the synth buffer at the output of con_tcx_ivas_fx() */
@@ -108,6 +117,8 @@ 
#define NONBE_FIX_1143_MASA_BRSW                        /* Nok: Fix for issue 1143: MSAN use of uninitialized value in masa decoding to binaural with dtx bitrate switching and 5 % FER */

#define NONBE_FIX_1220_OMASA_JBM_EXT_USAN               /* Nokia: fix issue 1220 OMASA EXT JBM USAN, also fix similar cases of free to avoid future problems */

#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 */





/* #################### End BASOP porting switches ############################ */

lib_com/prot_fx.h

+12 −9
Original line number Diff line number Diff line
@@ -3192,6 +3192,9 @@ void prep_tbe_exc_fx( 
    Word16 bwe_exc_fx[],         /* i/o: excitation for TBE                Q_exc*/

    const Word16 gain_preQ_fx,   /* i  : prequantizer excitation gain           */

    const Word16 code_preQ_fx[], /* i  : prequantizer excitation                */

#ifdef FIX_2010_PREP_TBE_EXC

    const Word16 Q_code_preQ, /* i  : Q, prequantizer excitation             */

#endif

    const Word16 Q_exc,        /* i  : Excitation,           bwe_exc Q-factor */

    const Word16 T0,           /* i  : integer pitch variables             Q0 */

    const Word16 T0_frac,      /* i  : Fractional pitch variables           Q0*/