Commit 857314dd authored by vaclav's avatar vaclav
Browse files

- Merge branch '1963_basop_portFltMR-1568-1471-1690' of... 

- Merge branch '1963_basop_portFltMR-1568-1471-1690' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop into 1963_basop_portFltMR-1568-1471-1690
parents 1ac8d54f 959ced42

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ 
#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 FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */

#define FIX_CREND_SIMPLIFY_CODE   

//#define FIX_CREND_SIMPLIFY_CODE   

#ifdef FIX_CREND_SIMPLIFY_CODE

#define FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */

#define USE_REVERB_16BIT_ROM                            /* if desactivated old rom hrtf tables is used */

lib_dec/lib_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1628,7 +1628,11 @@ static ivas_error IVAS_DEC_Setup( 


        IF( st_ivas->bfi == 0 )

        {

#ifdef FIX_CREND_SIMPLIFY_CODE

            IF( ( error = ivas_dec_setup( st_ivas ) ) != IVAS_ERR_OK )

#else

            IF( ( error = ivas_dec_setup( st_ivas, nSamplesRendered, data ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }

lib_rend/ivas_objectRenderer_mix_fx.c

+7 −6
Original line number Diff line number Diff line
@@ -207,8 +207,10 @@ void TDREND_MIX_Dealloc_fx( 
            free( hBinRendererTd->HrFiltSet_p->ModelParams.AlphaR_dyn_fx );



            free( hBinRendererTd->HrFiltSet_p->ModelParams.elevBsShape_dyn_fx );

        }

#endif





        IF( EQ_16( hBinRendererTd->HrFiltSet_p->ModelParams.modelROM, 1 ) )

        {

            free( hBinRendererTd->HrFiltSet_p );
@@ -216,7 +218,6 @@ void TDREND_MIX_Dealloc_fx( 
            *hBinRendererTd->pHrFiltSet_p = NULL;

        }

    }

    }



    return;

}

lib_util/hrtf_file_reader.c

+1 −1
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ static ivas_error TDREND_LoadBSplineBinary( 
    fread( &HrFiltSet_p->latency_s_fx, 1, sizeof( Word32 ), f_hrtf );

#else

    fread( &tmp32, 1, sizeof( Word32 ), f_hrtf );

    HrFiltSet_p->latency_s_fx = L_shr_r( Mpy_32_32_r( tmp32, 1000000000 ), Q31 -  factor_Q ) );

    HrFiltSet_p->latency_s_fx = L_shr_r( Mpy_32_32_r( tmp32, 1000000000 ), Q31 - factor_Q );

#endif

    model = &( HrFiltSet_p->ModelParams );