Commit 6cf56297 authored by emerit's avatar emerit
Browse files

tested ok using netcdf python reader

parent 9021b6c0

lib_rend/ivas_rom_binaural_crend_head.c

+3935 −3943

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_rom_binaural_crend_head.h

+8 −8
Original line number Diff line number Diff line
@@ -268,10 +268,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[BINAURAL_CHANNELS][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 */
@@ -282,10 +282,10 @@ 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[BINAURAL_CHANNELS][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];





 #ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c

+3 −4
Original line number Diff line number Diff line
@@ -1813,7 +1813,6 @@ int generate_reverb_ivas_tables_from_sofa( const char *file_path ) 
    PyArrayObject *dir_t = NULL;

    double a[3] = { 0 };

    double t[3] = { 0 };

    long nearest;

#else

    struct MYSOFA_ARRAY *latency_s = NULL;
@@ -2082,7 +2081,7 @@ int generate_reverb_ivas_tables_from_sofa( const char *file_path ) 


            fprintf( stderr, "Wrong file unsupported format hrir size too long > 240 samples à 48 kHz %s!\n\n", sofa_file_path );

            free( sofa_file_path );

            return err;

            return -1;

        }



        int32_t ind_max_ir = sofa_N;
@@ -2119,7 +2118,7 @@ int generate_reverb_ivas_tables_from_sofa( const char *file_path ) 
#ifndef FIX_REMOVE_MYSOFA

                pTemp[n] = hrtf->hrtf->DataIR.values[size * i + n] * mdft_scale_fact;

#else

                pTemp[n] = data_IR_current[size * i + n] * mdft_scale_fact;

                pTemp[n] = (float) ( data_IR_current[size * i + n] * (double) mdft_scale_fact );

#endif

            }

            ivas_mdft( pTemp, pHrtf_set_l_re[i], pHrtf_set_l_im[i], frame_len, frame_len );
@@ -2134,7 +2133,7 @@ int generate_reverb_ivas_tables_from_sofa( const char *file_path ) 
#ifndef FIX_REMOVE_MYSOFA

                pTemp[n] = hrtf->hrtf->DataIR.values[size * i + sofa_N + n] * mdft_scale_fact;

#else

                pTemp[n] = data_IR_current[size * i + sofa_N + n] * mdft_scale_fact;

                pTemp[n] = (float) ( data_IR_current[size * i + sofa_N + n] * (double) mdft_scale_fact );

#endif

            }

            ivas_mdft( pTemp, pHrtf_set_r_re[i], pHrtf_set_r_im[i], frame_len, frame_len );