Commit a17f8a35 authored by malenov's avatar malenov
Browse files

removal of TEMP_FIX_BSPLINE_MALLOC - needs to be resolved in another way

parent 31b662b1

lib_com/ivas_prot.h

+2 −4
Original line number Diff line number Diff line
@@ -5018,10 +5018,8 @@ void HRTF_model_precalc( 
);



void BSplineModelEvalDealloc(

    ModelParams_t *model                                       /* i  : Model parameters                        */

#ifndef TEMP_FIX_BSPLINE_MALLOC

    ,ModelEval_t *modelEval                                      /* i  : Model evaluation structure              */

#endif

    ModelParams_t *model,                                       /* i  : Model parameters                        */

    ModelEval_t *modelEval                                      /* i  : Model evaluation structure              */

);



void BSplineModelEvalITDDealloc(

lib_dec/ivas_init_dec.c

+1 −21
Original line number Diff line number Diff line
@@ -1691,28 +1691,8 @@ void ivas_destroy_dec( 
            BSplineModelEvalITDDealloc( &st_ivas->hHrtfTD->ModelParamsITD );

        }



        BSplineModelEvalDealloc( &st_ivas->hHrtfTD->ModelParams

#ifndef TEMP_FIX_BSPLINE_MALLOC

            ,&st_ivas->hHrtfTD->ModelEval 

#endif

        );

        BSplineModelEvalDealloc( &st_ivas->hHrtfTD->ModelParams, &st_ivas->hHrtfTD->ModelEval );



#ifdef TEMP_FIX_BSPLINE_MALLOC

        {

            ModelParams_t *model = &st_ivas->hHrtfTD->ModelParams;

            ModelEval_t *modelEval = &st_ivas->hHrtfTD->ModelEval;

            if ( !model->modelROM )

            {

                free_( model->EL_dyn );

                free_( model->ER_dyn );

            }

            if ( modelEval != NULL )

            {

                free_( modelEval->hrfModL );

                free_( modelEval->hrfModR );

            }

        }

#endif

        ivas_HRTF_binary_close( &st_ivas->hHrtfTD );

    }

lib_dec/ivas_sba_dec.c

+2 −21
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "wmc_auto.h"







#ifdef SBA_BR_SWITCHING

/*-------------------------------------------------------------------*

 * ivas_sba_dec_reinit()
@@ -210,28 +211,8 @@ ivas_error ivas_sba_dec_reinit( 
            BSplineModelEvalITDDealloc( &st_ivas->hHrtfTD->ModelParamsITD );

        }



        BSplineModelEvalDealloc( &st_ivas->hHrtfTD->ModelParams

#ifndef TEMP_FIX_BSPLINE_MALLOC

            , &st_ivas->hHrtfTD->ModelEval

#endif        

        );

        BSplineModelEvalDealloc( &st_ivas->hHrtfTD->ModelParams, &st_ivas->hHrtfTD->ModelEval );



#ifdef TEMP_FIX_BSPLINE_MALLOC

        {

            ModelParams_t *model = &st_ivas->hHrtfTD->ModelParams;

            ModelEval_t *modelEval = &st_ivas->hHrtfTD->ModelEval;

            if ( !model->modelROM )

            {

                free_( model->EL_dyn );

                free_( model->ER_dyn );

            }

            if ( modelEval != NULL )

            {

                free_( modelEval->hrfModL );

                free_( modelEval->hrfModR );

            }

        }

#endif

        ivas_HRTF_binary_close( &st_ivas->hHrtfTD );

    }

lib_rend/ivas_objectRenderer_hrFilt.c

+0 −4
Original line number Diff line number Diff line
@@ -1189,8 +1189,6 @@ void HRTF_model_precalc( 
    return;

}



#ifndef TEMP_FIX_BSPLINE_MALLOC



/*-------------------------------------------------------------------*

 * BSplineModelEvalDealloc()

 *
@@ -1263,8 +1261,6 @@ void BSplineModelEvalITDDealloc( 
    return;

}



#endif





/*-------------------------------------------------------------------*

 * SkipSmallest_ValueIndex()

lib_rend/ivas_objectRenderer_mix.c

+2 −22
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#endif







/*-------------------------------------------------------------------*

 * TDREND_MIX_LIST_SetPos()

 *
@@ -134,28 +135,7 @@ void TDREND_MIX_Dealloc( 
            {

                BSplineModelEvalITDDealloc( &hBinRendererTd->HrFiltSet_p->ModelParamsITD );

            }

            BSplineModelEvalDealloc( &hBinRendererTd->HrFiltSet_p->ModelParams

#ifndef TEMP_FIX_BSPLINE_MALLOC

                , &hBinRendererTd->HrFiltSet_p->ModelEval

#endif            

            );



#ifdef TEMP_FIX_BSPLINE_MALLOC

            {

                ModelParams_t *model = &hBinRendererTd->HrFiltSet_p->ModelParams;

                ModelEval_t *modelEval = &hBinRendererTd->HrFiltSet_p->ModelEval;

                if ( !model->modelROM )

                {

                    free_( model->EL_dyn );

                    free_( model->ER_dyn );

                }

                if ( modelEval != NULL )

                {

                    free_( modelEval->hrfModL );

                    free_( modelEval->hrfModR );

                }

            }

#endif

            BSplineModelEvalDealloc( &hBinRendererTd->HrFiltSet_p->ModelParams, &hBinRendererTd->HrFiltSet_p->ModelEval );

        }

        else

        {