Loading scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c +14 −3 Original line number Diff line number Diff line Loading @@ -56,10 +56,9 @@ #define DEFAULT_INPUT_ROM_FILE "ivas_binaural" #ifdef FIX_OLD_BINARY_FORMAT #define DEFAULT_BIN_FILE_EXT ".binnew" #else #define DEFAULT_BIN_FILE_EXT ".bin" #define DEFAULT_BIN_FILE_EXT_OUT ".binnew" #endif #define DEFAULT_BIN_FILE_EXT ".bin" #ifdef FIX_638_ENERGIE_IAC_ROM_TABLES #define IVAS_NB_RENDERER_TYPE 7 Loading Loading @@ -315,13 +314,25 @@ int main( int argc, char *argv[] ) for ( k = 0; k < nb_freq; k++ ) { #ifdef FIX_OLD_BINARY_FORMAT full_out_path = (char *) malloc( sizeof( char ) * ( strlen( output_path ) + 1 + strlen( output_file_name ) + 6 + strlen( DEFAULT_BIN_FILE_EXT_OUT ) + 1 ) ); #else full_out_path = (char *) malloc( sizeof( char ) * ( strlen( output_path ) + 1 + strlen( output_file_name ) + 6 + strlen( DEFAULT_BIN_FILE_EXT ) + 1 ) ); #endif if ( full_out_path ) { #ifdef FIX_OLD_BINARY_FORMAT #ifdef _WIN32 sprintf( full_out_path, "%s\\%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT_OUT ); #else sprintf( full_out_path, "%s/%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT_OUT ); #endif #else #ifdef _WIN32 sprintf( full_out_path, "%s\\%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT ); #else sprintf( full_out_path, "%s/%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT ); #endif #endif } else Loading scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c +3 −3 Original line number Diff line number Diff line Loading @@ -1498,6 +1498,8 @@ static uint16_t get_fft_size( return 0; } #endif /*-------------------------------------------------------------------* * ivas_reverb_get_hrtf_set_properties() * Loading Loading @@ -1684,8 +1686,6 @@ void static ivas_reverb_get_hrtf_set_properties( return; } #endif int generate_reverb_ivas_tables_from_sofa( const char *file_path ) { char *sofa_file_path = NULL; Loading Loading @@ -2474,7 +2474,7 @@ void update_h_file_with_reverb( int32_t samplerate ) #ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB fprintf( fp, "\nextern float defaultHRIR_left_avg_power_%dkHz[%s];", samplerate / 1000, len_str ); #else fprintf( fp, "\extern float defaultHRIR_left_avg_power_%dkHz[LR_IAC_LENGTH_NR_FC];", samplerate / 1000 ); fprintf( fp, "\nextern float defaultHRIR_left_avg_power_%dkHz[LR_IAC_LENGTH_NR_FC];", samplerate / 1000 ); #endif /* float *defaultHRIR_right_avg_power[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];*/ #ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB fprintf( fp, "\nextern float defaultHRIR_right_avg_power_%dkHz[%s];", samplerate / 1000, len_str ); Loading Loading
scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c +14 −3 Original line number Diff line number Diff line Loading @@ -56,10 +56,9 @@ #define DEFAULT_INPUT_ROM_FILE "ivas_binaural" #ifdef FIX_OLD_BINARY_FORMAT #define DEFAULT_BIN_FILE_EXT ".binnew" #else #define DEFAULT_BIN_FILE_EXT ".bin" #define DEFAULT_BIN_FILE_EXT_OUT ".binnew" #endif #define DEFAULT_BIN_FILE_EXT ".bin" #ifdef FIX_638_ENERGIE_IAC_ROM_TABLES #define IVAS_NB_RENDERER_TYPE 7 Loading Loading @@ -315,13 +314,25 @@ int main( int argc, char *argv[] ) for ( k = 0; k < nb_freq; k++ ) { #ifdef FIX_OLD_BINARY_FORMAT full_out_path = (char *) malloc( sizeof( char ) * ( strlen( output_path ) + 1 + strlen( output_file_name ) + 6 + strlen( DEFAULT_BIN_FILE_EXT_OUT ) + 1 ) ); #else full_out_path = (char *) malloc( sizeof( char ) * ( strlen( output_path ) + 1 + strlen( output_file_name ) + 6 + strlen( DEFAULT_BIN_FILE_EXT ) + 1 ) ); #endif if ( full_out_path ) { #ifdef FIX_OLD_BINARY_FORMAT #ifdef _WIN32 sprintf( full_out_path, "%s\\%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT_OUT ); #else sprintf( full_out_path, "%s/%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT_OUT ); #endif #else #ifdef _WIN32 sprintf( full_out_path, "%s\\%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT ); #else sprintf( full_out_path, "%s/%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT ); #endif #endif } else Loading
scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c +3 −3 Original line number Diff line number Diff line Loading @@ -1498,6 +1498,8 @@ static uint16_t get_fft_size( return 0; } #endif /*-------------------------------------------------------------------* * ivas_reverb_get_hrtf_set_properties() * Loading Loading @@ -1684,8 +1686,6 @@ void static ivas_reverb_get_hrtf_set_properties( return; } #endif int generate_reverb_ivas_tables_from_sofa( const char *file_path ) { char *sofa_file_path = NULL; Loading Loading @@ -2474,7 +2474,7 @@ void update_h_file_with_reverb( int32_t samplerate ) #ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB fprintf( fp, "\nextern float defaultHRIR_left_avg_power_%dkHz[%s];", samplerate / 1000, len_str ); #else fprintf( fp, "\extern float defaultHRIR_left_avg_power_%dkHz[LR_IAC_LENGTH_NR_FC];", samplerate / 1000 ); fprintf( fp, "\nextern float defaultHRIR_left_avg_power_%dkHz[LR_IAC_LENGTH_NR_FC];", samplerate / 1000 ); #endif /* float *defaultHRIR_right_avg_power[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];*/ #ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB fprintf( fp, "\nextern float defaultHRIR_right_avg_power_%dkHz[%s];", samplerate / 1000, len_str ); Loading