Commit 4a73f3f6 authored by emerit's avatar emerit
Browse files

remove search for python path not needed

parent 60c9a717

lib_rend/ivas_rom_binaural_crend_head.h

+8 −8
Original line number Diff line number Diff line
@@ -259,10 +259,10 @@ extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_32kHz[15][BINAURAL_C 
extern uint16_t CRendBin_Combined_BRIR_index_frequency_max_diffuse_32kHz;

extern float CRendBin_Combined_BRIR_inv_diffuse_weight_32kHz[15];

extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS][40];

extern float CRendBin_Combined_BRIR_coeff_re_32kHz[15][BINAURAL_CHANNELS][2819];

extern float CRendBin_Combined_BRIR_coeff_im_32kHz[15][BINAURAL_CHANNELS][2819];

extern float CRendBin_Combined_BRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS][2870];

extern float CRendBin_Combined_BRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS][2870];

extern float CRendBin_Combined_BRIR_coeff_re_32kHz[15][BINAURAL_CHANNELS][2818];

extern float CRendBin_Combined_BRIR_coeff_im_32kHz[15][BINAURAL_CHANNELS][2818];

extern float CRendBin_Combined_BRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS][2868];

extern float CRendBin_Combined_BRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS][2868];



/* Sample Rate = 16000 */
@@ -273,8 +273,8 @@ extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_16kHz[15][BINAURAL_C 
extern uint16_t CRendBin_Combined_BRIR_index_frequency_max_diffuse_16kHz;

extern float CRendBin_Combined_BRIR_inv_diffuse_weight_16kHz[15];

extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS][40];

extern float CRendBin_Combined_BRIR_coeff_re_16kHz[15][BINAURAL_CHANNELS][1774];

extern float CRendBin_Combined_BRIR_coeff_im_16kHz[15][BINAURAL_CHANNELS][1774];

extern float CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS][2522];

extern float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][2522];

extern float CRendBin_Combined_BRIR_coeff_re_16kHz[15][BINAURAL_CHANNELS][1799];

extern float CRendBin_Combined_BRIR_coeff_im_16kHz[15][BINAURAL_CHANNELS][1799];

extern float CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS][2474];

extern float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][2474];

#endif /* _IVAS_ROM_BINAURAL_CREND_HEAD_ */

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+3 −14
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <math.h>



#include "ivas_rom_binauralRenderer.h"

#include "ivas_rom_binaural_crend_head.h"
@@ -56,9 +55,6 @@ 
#define DEFAULT_PATH "./"

#endif



#define PARABIN_FILE_312

#define MIXER_CONV_BINARY_FILE_311



#define DEFAULT_INPUT_ROM_FILE    "ivas_binaural"

#define DEFAULT_INPUT_TD_BIN_FILE "hrfilter_model"

#ifdef PARABIN_FILE_312
@@ -2458,18 +2454,10 @@ int16_t check_hrtf_data( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG in 
            {

                ctrl_size = tabs_ptrs.pIndex_frequency_max_diffuse[iIndex] * sizeof( float );

                if ( memcmp( coeff_rptr, hrtf_data_in_rptr, ctrl_size ) != 0 )

                {

                    fprintf( stderr, "check_hrtf_data of binary file failed: bad coeff_diffuse_re!\n\n" );

                    return -1;

                }

                /*for ( iCtrl = 0; iCtrl < tabs_ptrs.pIndex_frequency_max_diffuse[iIndex];  iCtrl++)

                {

                    if ( fabs( coeff_rptr[iCtrl] - ((float*)hrtf_data_in_rptr)[iCtrl] ) > 0.000001 )

                {

                    fprintf( stderr, "check_hrtf_data of binary file failed: bad coeff_diffuse_im!\n\n" );

                    return -1;

                }

                }*/

                hrtf_data_in_rptr += ctrl_size;

                coeff_rptr += tabs_ptrs.pIndex_frequency_max_diffuse[iIndex++];

            }
@@ -2855,7 +2843,8 @@ void rom2bin_terminat( void ) 
    {

        free( full_in_td_path );

    }

#ifdef PARABIN_FILE_312 if ( input_parabin_path != NULL )

#ifdef PARABIN_FILE_312

    if ( input_parabin_path != NULL )

    {

        free( input_parabin_path );

    }

scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c

+0 −3
Original line number Diff line number Diff line
@@ -626,9 +626,6 @@ int main( int argc, char *argv[] ) 
#ifdef FIX_REMOVE_MYSOFA

    Py_Initialize();



    Py_SetPath( _wgetenv( L"PYTHONPATH" ) );

    printf( "Py_GetPath = %ls, python path = %ls \n", Py_GetPath(), _wgetenv( L"PYTHONPATH" ) );



    if ( numpy_import_array( -1 ) == -1 )

    {

        Py_Finalize();