Commit 6b6e9c87 authored by multrus's avatar multrus
Browse files

[cleanup] accept TD_TDREND_FIX_NULLPTR_ACCESS, TD_REND_FIX_DIV_BY_ZERO, RENAME_GWLPR

parent f73397f4

lib_com/options.h

+0 −5
Original line number Diff line number Diff line
@@ -151,11 +151,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */







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

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

#define SPLIT_REND_WITH_HEAD_ROT                        /* Dlb,FhG: Split Rendering contributions 21 and 35 */

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_PRED_QUANT_63_PNTS

lib_dec/FEC_HQ_phase_ecu.c

+0 −12
Original line number Diff line number Diff line
@@ -1079,11 +1079,7 @@ static void subst_spec( 
            }

            i++;

            im_ind--;

#ifdef RENAME_GWLPR

            if ( i >= ivas_gwlpr[k + 1] )

#else

            if ( i >= gwlpr[k + 1] )

#endif

            {

                k++;

            }
@@ -1195,11 +1191,7 @@ static void subst_spec( 


            i++;

            im_ind--;

#ifdef RENAME_GWLPR

            if ( i >= ivas_gwlpr[k + 1] )

#else

            if ( i >= gwlpr[k + 1] )

#endif

            {

                k++;

            }
@@ -1254,11 +1246,7 @@ static void subst_spec( 
        }

        i++;



#ifdef RENAME_GWLPR

        if ( i >= ivas_gwlpr[k + 1] )

#else

        if ( i >= gwlpr[k + 1] )

#endif

        {

            k++;

        }

lib_dec/rom_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -92,11 +92,7 @@ const float lsf_tab[LPC_SHB_ORDER] = 
const int16_t gw[LGW_MAX] =    {  1,  3,  6,  10,  16,  32,  64,  128, 192 };



/* 31.25 343.75 718.75 1218.75 1968.75 4000 8000 16000 24000 */

#ifdef RENAME_GWLPR

const int16_t ivas_gwlpr[LGW_MAX] = {  1,   3*QUOT_LPR_LTR-1, 6*QUOT_LPR_LTR-1, 10*QUOT_LPR_LTR-1, 16*QUOT_LPR_LTR-1, 32*QUOT_LPR_LTR, 64*QUOT_LPR_LTR, 128*QUOT_LPR_LTR, 192*QUOT_LPR_LTR };

#else

const int16_t gwlpr[LGW_MAX] = {  1,   3*QUOT_LPR_LTR-1, 6*QUOT_LPR_LTR-1, 10*QUOT_LPR_LTR-1, 16*QUOT_LPR_LTR-1, 32*QUOT_LPR_LTR, 64*QUOT_LPR_LTR, 128*QUOT_LPR_LTR, 192*QUOT_LPR_LTR };

#endif



const float w_hamm48k_2[L_TRANA48k/2] =

{

lib_dec/rom_dec.h

+0 −4
Original line number Diff line number Diff line
@@ -56,11 +56,7 @@ extern const int16_t hestable[15]; 
extern const float lsf_tab[LPC_SHB_ORDER];



extern const int16_t gw[LGW_MAX];

#ifdef RENAME_GWLPR

extern const int16_t ivas_gwlpr[LGW_MAX];

#else

extern const int16_t gwlpr[LGW_MAX];

#endif

extern const float w_hamm32k_2[L_TRANA32k / 2];

extern const float w_hamm16k_2[L_TRANA16k / 2];

extern const float w_hamm_sana32k_2[L_PROT_HAMM_LEN2_32k];

lib_rend/ivas_objectRenderer.c

+0 −5
Original line number Diff line number Diff line
@@ -631,16 +631,11 @@ ivas_error ivas_td_binaural_open_ext( 
    hTransSetup.ls_azimuth = NULL;

    hTransSetup.ls_elevation = NULL;

#endif

#ifdef TD_TDREND_FIX_NULLPTR_ACCESS

    if ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM )

    {

        hTransSetup.ls_azimuth = customLsInput->ls_azimuth;

        hTransSetup.ls_elevation = customLsInput->ls_elevation;

    }

#else

    hTransSetup.ls_azimuth = customLsInput->ls_azimuth;

    hTransSetup.ls_elevation = customLsInput->ls_elevation;

#endif /* TD_TDREND_FIX_NULLPTR_ACCESS */





    if ( NULL != hRendCfg )