Commit f1eb5e76 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' into 109-orientation-tracking-modes

parents 0049832d 3363a39d

lib_com/ivas_cnst.h

+0 −5
Original line number Diff line number Diff line
@@ -1444,11 +1444,6 @@ typedef enum 
typedef enum

{

    TDREND_HRFILT_Method_BSplineModel

#ifdef TDREND_HRTF_TABLE_METHODS

    ,

    TDREND_HRFILT_Method_Table_F,

    TDREND_HRFILT_Method_Table_S

#endif

} TDREND_HRFILT_Method_t;



typedef enum

lib_com/ivas_prot.h

+0 −6
Original line number Diff line number Diff line
@@ -5134,12 +5134,6 @@ void BSplineModelEvalDealloc( 
);





#ifdef TDREND_HRTF_TABLE_METHODS

void TDREND_HRFILT_SetFiltSet(

    TDREND_HRFILT_FiltSet_t *HrFiltSet_p,                       /* i/o: HR hilter set structure                 */ 

    FILE *f_hrtf                                                /* i  : File handle for HR filter parameters    */

);

#endif



ivas_error TDREND_REND_RenderSourceHRFilt(

    TDREND_SRC_t *Src_p,                                        /* i/o: The source to be rendered               */

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ 
#define SBA_BR_SWITCHING                                /* Issue 114: Changes for SBA bit rate switching with reconfiguration for bitrates with same number of transport channels*/

#ifdef SBA_BR_SWITCHING

#define SBA_BR_SWITCHING_RECONFIG                       /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/

#define SBA_BR_SWITCHING_COMPLEXITY_FIX                 /* VA: fix complexity overhead */ 

#endif

#define FIX_I59_DELAY_ROUNDING                          /* Issue 59: rounding in sample domain instead of nanosec for IVAS_ENC_GetDelay() and IVAS_DEC_GetDelay() */

#define FIX_FIX_I59                                     /* Issue 59:  small fix concerning LFE delay rounding */
@@ -163,6 +164,9 @@ 
#define SET_TNS_FLAG_IN_EVERY_FRAME                     /* FhG: issue 288 - mismatch between encoder and decoder wrt TNS usage in unified stereo  with frameloss */

#define FIX_FOR_TEST                                    /* allows tests to pass using old TD binary file, to be removed after merge*/

#define FIX_299_ISM_BWS                                 /* VA: issue 299 - fix Band-width switching issues in ISM format */

#define FIX_309_PREMPH_MEM_SCE                          /* FhG: issue 309 - fix overwriting of mem_preemph_enc in ivas preprocessing for SCE and tcxonly modes*/



#define FIX_317                                         /* FhG: issue 317 - address sanitizer error in MDCT-Stereo PLC */





/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_stat_dec.h

+0 −6
Original line number Diff line number Diff line
@@ -1527,12 +1527,6 @@ typedef struct TDREND_HRFILT_FiltSet_struct 
    float *ItdSetNominal_p;

    float *LeftFiltSet_p;

    float *RightFiltSet_p;

#ifdef TDREND_HRTF_TABLE_METHODS

    int16_t *AzimStartIdx_p;

    int16_t *NumAzim_p;

    float *ElevFull_p;

    float ElevIncr;

#endif

    ModelParams_t ModelParams;

    ModelEval_t ModelEval;

    ModelParamsITD_t ModelParamsITD;

lib_dec/ivas_stereo_mdct_stereo_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -327,11 +327,19 @@ void stereo_decoder_tcx( 
                hStereoMdct->reverse_dmx = 0;

            }



#ifdef FIX_317

            if ( ( nrgRatio > 1.0f ) && ( k < ( ( core_r == TCX_10_CORE ) ? NB_DIV : 1 ) ) )

#else

            if ( ( nrgRatio > 1.0f ) && ( k < ( ( core_r == TCX_20_CORE ) ? 1 : NB_DIV ) ) )

#endif

            {

                v_multc( spec_r[k], nrgRatio, spec_r[k], L_frameTCX_r );

            }

#ifdef FIX_317

            else if ( ( nrgRatio < 1.0f ) && ( k < ( ( core_l == TCX_10_CORE ) ? NB_DIV : 1 ) ) )

#else

            else if ( ( nrgRatio < 1.0f ) && ( k < ( ( core_l == TCX_20_CORE ) ? 1 : NB_DIV ) ) )

#endif

            {

                v_multc( spec_l[k], 1.0f / nrgRatio, spec_l[k], L_frameTCX_l );

            }