Unverified Commit 390a3262 authored by norvell's avatar norvell
Browse files

Fix missing defines and cleanup of commented code

parent 9c19a3db

lib_rend/ivas_objectRenderer_hrFilt_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -779,8 +779,6 @@ static void getStandardBSplineSampVec_fx( 


    /* assuming triple knot at the first knot */

#ifdef FIX_2235_TD_RENDERER_WORD16

    // tmp32 = L_shl( L_sub( L_deposit_l( KSeq_fx[NumBFs - 3] ), L_deposit_l( KSeq_fx[0] ) ), sub( 22, KSeq_Q_fx ) ); /* Q22 */

    // knot_interval_fx = L_deposit_h( BASOP_Util_Divide3216_Scale( tmp32, sub( NumBFs, 3 ), &tmp_e1 ) );

    knot_interval_fx = shl( sub( KSeq_fx[1], KSeq_fx[0] ), Q6 - KSeq_Q_fx ); /* Variable Q -> Q6 */

    tmp_e1 = 9;

#else

lib_rend/ivas_objectRenderer_mix_fx.c

+17 −1
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ void TDREND_MIX_Dealloc_fx( 
            free( hBinRendererTd->HrFiltSet_p->ModelParams.elevKSeq_dyn_fx );

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

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



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

        }

#endif
@@ -497,7 +498,6 @@ static ivas_error DefaultBSplineModel_fx( 
        move16();



        assert( azimSegSamples == 360 / model->azimDim3[i] );



        FOR( j = 0; j < model->azimDim3[i] + 1; j++ )

        {

#ifdef FIX_2235_TD_RENDERER_WORD16
@@ -544,11 +544,19 @@ static ivas_error DefaultBSplineModel_fx( 
            model->AlphaR_e = Q15 - defaultHRIR_rom_Alpha48_Q_fx;

            move16();

#endif

#ifdef FIX_2235_TD_RENDERER_WORD16

            model->EL_fx = defaultHRIR_rom_EL48_fx; // Q28

#else

            model->EL_fx = (const Word32 *) defaultHRIR_rom_EL48_fx; // Q28

#endif

            move16();

            model->EL_e = Q31 - defaultHRIR_rom_E48_Q_fx;

            move16();

#ifdef FIX_2235_TD_RENDERER_WORD16

            model->ER_fx = defaultHRIR_rom_ER48_fx; // Q28

#else

            model->ER_fx = (const Word32 *) defaultHRIR_rom_ER48_fx; // Q28

#endif

            move16();

            model->ER_e = Q31 - defaultHRIR_rom_E48_Q_fx;

            move16();
@@ -592,11 +600,19 @@ static ivas_error DefaultBSplineModel_fx( 
            model->AlphaR_e = Q15 - defaultHRIR_rom_Alpha32_Q_fx;

            move16();

#endif

#ifdef FIX_2235_TD_RENDERER_WORD16

            model->EL_fx = defaultHRIR_rom_EL32_fx; // Q28

#else

            model->EL_fx = (const Word32 *) defaultHRIR_rom_EL32_fx; // Q28

#endif

            move16();

            model->EL_e = Q31 - defaultHRIR_rom_E32_Q_fx;

            move16();

#ifdef FIX_2235_TD_RENDERER_WORD16

            model->ER_fx = defaultHRIR_rom_ER32_fx; // Q28

#else

            model->ER_fx = (const Word32 *) defaultHRIR_rom_ER32_fx; // Q28

#endif

            move16();

            model->ER_e = Q31 - defaultHRIR_rom_E32_Q_fx;

            move16();

lib_util/hrtf_file_reader.c

+2 −0
Original line number Diff line number Diff line
@@ -663,7 +663,9 @@ static ivas_error TDREND_LoadBSplineBinary( 
    fread( &factor_Q, sizeof( Word16 ), 1, f_hrtf );



    model->AlphaL_e = Q15 - factor_Q;

#ifndef FIX_2235_TD_RENDERER_WORD16

    //    model->AlphaL_dyn_e = 1; /* force to 6 to be corrected  */

#endif

    model->AlphaR_e = model->AlphaL_e;



#ifdef FIX_2235_TD_RENDERER_WORD16