Commit ee528a0c authored by norvell's avatar norvell
Browse files

Fix renaming of define, wrong in previous commit

parent 5542bb62

lib_rend/ivas_objectRenderer_sfx.c

+3 −3
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ void TDREND_firfilt( 
    const float prevGain           /* i  : Previous gain                  */

)

{

#ifdef FIX_569

#ifdef FIX_569_TD_FILTER_FLEXIBLE_LENGTH

    float *buffer;

#else

    float buffer[SFX_SPAT_BIN_MAX_FILTER_LENGTH - 1 + L_SUBFRAME5MS_48k];
@@ -251,7 +251,7 @@ void TDREND_firfilt( 
    float tmp;

    int16_t i, j;

    float step, gain_tmp, gain_delta;

#ifdef FIX_569

#ifdef FIX_569_TD_FILTER_FLEXIBLE_LENGTH

    buffer = (float *) malloc( ( filterlength - 1 + L_SUBFRAME5MS_48k ) * sizeof( float ) );

#endif
@@ -285,7 +285,7 @@ void TDREND_firfilt( 
        }

    }



#ifdef FIX_569

#ifdef FIX_569_TD_FILTER_FLEXIBLE_LENGTH

    free( buffer );

#endif

lib_rend/ivas_objectRenderer_sources.c

+9 −9
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( 
    float ListRelPos[3], ListRelDist;

    float ListRelPosAbs[3]; /* Relative position, ignoring orientation of listener */

    float Azim, Elev;

#ifdef FIX_569

#ifdef FIX_569_TD_FILTER_FLEXIBLE_LENGTH

    float *hrf_left;

    float *hrf_right;

#else
@@ -282,7 +282,7 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( 


    *filterlength = HrFiltSet_p->FiltLength;



#ifdef FIX_569

#ifdef FIX_569_TD_FILTER_FLEXIBLE_LENGTH

    hrf_left = (float *) malloc( *filterlength * sizeof( float ) );

    hrf_right = (float *) malloc( *filterlength * sizeof( float ) );

#endif
@@ -380,7 +380,7 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( 
        set_f( hrf_right_delta, 0.0f, *filterlength );

    }



#ifdef FIX_569

#ifdef FIX_569_TD_FILTER_FLEXIBLE_LENGTH

    free( hrf_left );

    free( hrf_right );

#endif
@@ -604,7 +604,7 @@ static float TDREND_SRC_SPATIAL_GetDistGain( 
 --------------------------------------------------------------------*/



ivas_error TDREND_SRC_Alloc(

#ifdef FIX_569

#ifdef FIX_569_TD_FILTER_FLEXIBLE_LENGTH

    TDREND_SRC_t **Src_pp,   /* i/o: Source          */

    const int16_t FiltLength /* i  : Filter length   */

#else
@@ -624,7 +624,7 @@ ivas_error TDREND_SRC_Alloc( 
    {

        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, " TDREND_SRC_Alloc: Allocation error\n" ) );

    }

#ifdef FIX_569

#ifdef FIX_569_TD_FILTER_FLEXIBLE_LENGTH

    /* Allocate filter buffers */

    Src_p->hrf_left_prev = malloc( FiltLength * sizeof( float ) );

    Src_p->hrf_right_prev = malloc( FiltLength * sizeof( float ) );
@@ -663,7 +663,7 @@ void TDREND_SRC_Dealloc( 
    {

        return;

    }

#ifdef FIX_569

#ifdef FIX_569_TD_FILTER_FLEXIBLE_LENGTH

    /* Dealloc the filter buffers */

    free( Src_p->hrf_left_prev );

    free( Src_p->hrf_right_prev );
@@ -694,7 +694,7 @@ void TDREND_SRC_Dealloc( 


void TDREND_SRC_Init(

    TDREND_SRC_t *Src_p, /* i/o: Source to initialize    */

#ifdef FIX_569

#ifdef FIX_569_TD_FILTER_FLEXIBLE_LENGTH

    const TDREND_PosType_t PosType, /* i  : Position type specifier */

    const int16_t FiltLength        /* i  : Filter length           */

#else
@@ -714,13 +714,13 @@ void TDREND_SRC_Init( 
    /* Reset memory buffers */

    Src_p->itd = 0;

    Src_p->previtd = 0;

#ifdef FIX_569

#ifdef FIX_569_TD_FILTER_FLEXIBLE_LENGTH

    Src_p->filterlength = FiltLength;

#else

    Src_p->filterlength = -1;

#endif

    set_f( Src_p->mem_itd, 0.0f, ITD_MEM_LEN );

#ifdef FIX_569

#ifdef FIX_569_TD_FILTER_FLEXIBLE_LENGTH

    set_f( Src_p->mem_hrf_left, 0.0f, FiltLength - 1 );

    set_f( Src_p->mem_hrf_right, 0.0f, FiltLength - 1 );

    set_f( Src_p->hrf_left_prev, 0.0f, FiltLength );