Commit e035c038 authored by emerit's avatar emerit
Browse files

fix test malloc lr_energy_and_iac_dyn

parent 9dbe03b4

lib_rend/ivas_crend.c

+0 −6
Original line number Diff line number Diff line
@@ -533,7 +533,6 @@ static ivas_error ivas_rend_initCrend( 
#ifndef FIX_INV_DIFFUSE_WEIGHT

                        hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_32kHz[i];

#endif



                        for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                        {

#ifdef FIX_INV_DIFFUSE_WEIGHT
@@ -603,7 +602,6 @@ static ivas_error ivas_rend_initCrend( 
#ifndef FIX_INV_DIFFUSE_WEIGHT

                        hHrtf->inv_diffuse_weight[i] = CRendBin_HOA2_HRIR_inv_diffuse_weight_48kHz[i];

#endif



                        for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                        {

#ifdef FIX_INV_DIFFUSE_WEIGHT
@@ -634,7 +632,6 @@ static ivas_error ivas_rend_initCrend( 
#ifndef FIX_INV_DIFFUSE_WEIGHT

                        hHrtf->inv_diffuse_weight[i] = CRendBin_HOA2_HRIR_inv_diffuse_weight_32kHz[i];

#endif



                        for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                        {

#ifdef FIX_INV_DIFFUSE_WEIGHT
@@ -937,7 +934,6 @@ static ivas_error ivas_rend_initCrend( 
#ifndef FIX_INV_DIFFUSE_WEIGHT

                    hHrtf->inv_diffuse_weight[i] = hSetOfHRTF->hHRTF_hrir_hoa3->inv_diffuse_weight[i];

#endif



                    for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                    {

#ifdef FIX_INV_DIFFUSE_WEIGHT
@@ -975,7 +971,6 @@ static ivas_error ivas_rend_initCrend( 
#ifndef FIX_INV_DIFFUSE_WEIGHT

                    hHrtf->inv_diffuse_weight[i] = hSetOfHRTF->hHRTF_hrir_hoa2->inv_diffuse_weight[i];

#endif



                    for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                    {

#ifdef FIX_INV_DIFFUSE_WEIGHT
@@ -1013,7 +1008,6 @@ static ivas_error ivas_rend_initCrend( 
#ifndef FIX_INV_DIFFUSE_WEIGHT

                    hHrtf->inv_diffuse_weight[i] = hSetOfHRTF->hHRTF_hrir_foa->inv_diffuse_weight[i];

#endif



                    for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                    {

#ifdef FIX_INV_DIFFUSE_WEIGHT

lib_util/hrtf_file_reader.c

+16 −0
Original line number Diff line number Diff line
@@ -449,6 +449,10 @@ static ivas_error LoadBSplineBinary( 
    for ( i = 0; i < 3; i++ )

    {

        HrFiltSet_p->lr_energy_and_iac_dyn[i] = (float *) malloc( LR_IAC_LENGTH_NR_FC * sizeof( float ) );

        if ( HrFiltSet_p->lr_energy_and_iac_dyn[i] == NULL )

        {

            return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );

        }

        fread( HrFiltSet_p->lr_energy_and_iac_dyn[i], sizeof( const float ), LR_IAC_LENGTH_NR_FC, f_hrtf );

        HrFiltSet_p->lr_energy_and_iac[i] = (const float *) HrFiltSet_p->lr_energy_and_iac_dyn[i];

    }
@@ -482,6 +486,12 @@ static ivas_error set_default_reverb_iac_energy( 
        for ( i = 0; i < 3; i++ )

        {

            HrFiltSet_p->lr_energy_and_iac_dyn[i] = (float *) malloc( LR_IAC_LENGTH_NR_FC * sizeof( float ) );

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

            if ( HrFiltSet_p->lr_energy_and_iac_dyn[i] == NULL )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );

            }

#endif

        }

        switch ( HrFiltSet_p->SampleRate )

        {
@@ -603,6 +613,12 @@ static ivas_error load_reverb_from_binary( 
        for ( i = 0; i < 3; i++ )

        {

            HrFiltSet_p->lr_energy_and_iac_dyn[i] = (float *) malloc( LR_IAC_LENGTH_NR_FC * sizeof( float ) );

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

            if ( HrFiltSet_p->lr_energy_and_iac_dyn[i] == NULL )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );

            }

#endif

            fread( HrFiltSet_p->lr_energy_and_iac_dyn[i], sizeof( const float ), LR_IAC_LENGTH_NR_FC, f_hrtf );

            HrFiltSet_p->lr_energy_and_iac[i] = (const float *) HrFiltSet_p->lr_energy_and_iac_dyn[i];

        }

lib_util/hrtf_file_reader.h

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
typedef struct hrtfFileReader hrtfFileReader;



#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#include "ivas_cnst.h"

typedef enum

{

    HRTF_READER_RENDERER_BINAURAL_INVALID,