Loading apps/decoder.c +1 −0 Original line number Diff line number Diff line Loading @@ -664,6 +664,7 @@ int main( } IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv = NULL; IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv ); if ( ( error = load_fastconv_HRTF_from_binary( hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK ) { fprintf( stderr, "\nError in loading HRTF binary file %s for FastConv \n\n", arg.hrtfCRendFileName ); Loading lib_dec/ivas_binRenderer_internal.c +7 −6 Original line number Diff line number Diff line Loading @@ -496,12 +496,13 @@ static ivas_error ivas_binRenderer_convModuleOpen( *-------------------------------------------------------------------------*/ ivas_error ivas_allocate_binaural_hrtf( HRTFS_FASTCONV *HrtfFastConv, AUDIO_CONFIG output_config, BINAURAL_INPUT_AUDIO_CONFIG input_config, RENDERER_TYPE renderer_type, int8_t is_loudspeaker_setup, int16_t allocate_init_flag ) HRTFS_FASTCONV *HrtfFastConv, /* i/o: FASTCONV HRTF structure */ AUDIO_CONFIG output_config, /* i : output audio configuration */ BINAURAL_INPUT_AUDIO_CONFIG input_config, /* i : binaural input audio config */ RENDERER_TYPE renderer_type, /* i : renderer type */ int8_t is_loudspeaker_setup, /* i : loudspeaker setup information */ int16_t allocate_init_flag /* i : Memory allocation flag */ ) { int16_t i, j; /*malloc for HOA3, HOA2, FOA*/ Loading lib_dec/ivas_init_dec.c +2 −0 Original line number Diff line number Diff line Loading @@ -663,6 +663,7 @@ ivas_error ivas_init_decoder_front( { return error; } if ( ( error = ivas_HRTF_parambin_binary_open( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) { return error; Loading Loading @@ -2037,6 +2038,7 @@ void ivas_destroy_dec( /* CRend binaural renderer handle */ ivas_HRTF_CRend_binary_close( &st_ivas->hSetOfHRTF ); #ifdef FIX_1720_HRTF_FASTCONV /* Fastconv HRTF memories */ ivas_binaural_hrtf_close( &st_ivas->hHrtfFastConv ); #endif /* Fastconv HRTF filters */ Loading lib_rend/ivas_stat_rend.h +3 −2 Original line number Diff line number Diff line Loading @@ -1378,9 +1378,10 @@ typedef struct ivas_hrtfs_fastconv_struct float ***rightHRIRReal_FOA; float ***rightHRIRImag_FOA; float FASTCONV_FOA_latency_s; BINAURAL_INPUT_AUDIO_CONFIG input_cfg_var; int16_t allocate_init_flag; int16_t nChannels; int16_t allocate_init_flag; /*Memory allocation flag 0: if the hrtf pointers are allocated at application level , 1: of allocated at ivas_binaural_hrtf_open() */ int16_t nChannels; /*Number of channels updated based on maximum of cicp table*/ #else #ifdef UPDATE_FASTCONV_SBA_FILTER float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA]; Loading lib_util/hrtf_file_reader.c +2 −0 Original line number Diff line number Diff line Loading @@ -34,6 +34,7 @@ #include <string.h> #include "prot.h" #include "ivas_prot_rend.h" #ifdef FIX_1720_HRTF_FASTCONV #include "ivas_prot.h" #endif Loading Loading @@ -1544,6 +1545,7 @@ ivas_error load_fastconv_HRTF_from_binary( free( hrtf_data ); return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" ); } /* Create the HRTF reading the raw data from the binary file */ if ( ( create_fastconv_HRTF_from_rawdata( &hHrtfFastConv, hrtf_data, hrtf_header.rend_type, hrtf_header.input_cfg ) ) != IVAS_ERR_OK ) { Loading Loading
apps/decoder.c +1 −0 Original line number Diff line number Diff line Loading @@ -664,6 +664,7 @@ int main( } IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv = NULL; IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv ); if ( ( error = load_fastconv_HRTF_from_binary( hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK ) { fprintf( stderr, "\nError in loading HRTF binary file %s for FastConv \n\n", arg.hrtfCRendFileName ); Loading
lib_dec/ivas_binRenderer_internal.c +7 −6 Original line number Diff line number Diff line Loading @@ -496,12 +496,13 @@ static ivas_error ivas_binRenderer_convModuleOpen( *-------------------------------------------------------------------------*/ ivas_error ivas_allocate_binaural_hrtf( HRTFS_FASTCONV *HrtfFastConv, AUDIO_CONFIG output_config, BINAURAL_INPUT_AUDIO_CONFIG input_config, RENDERER_TYPE renderer_type, int8_t is_loudspeaker_setup, int16_t allocate_init_flag ) HRTFS_FASTCONV *HrtfFastConv, /* i/o: FASTCONV HRTF structure */ AUDIO_CONFIG output_config, /* i : output audio configuration */ BINAURAL_INPUT_AUDIO_CONFIG input_config, /* i : binaural input audio config */ RENDERER_TYPE renderer_type, /* i : renderer type */ int8_t is_loudspeaker_setup, /* i : loudspeaker setup information */ int16_t allocate_init_flag /* i : Memory allocation flag */ ) { int16_t i, j; /*malloc for HOA3, HOA2, FOA*/ Loading
lib_dec/ivas_init_dec.c +2 −0 Original line number Diff line number Diff line Loading @@ -663,6 +663,7 @@ ivas_error ivas_init_decoder_front( { return error; } if ( ( error = ivas_HRTF_parambin_binary_open( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) { return error; Loading Loading @@ -2037,6 +2038,7 @@ void ivas_destroy_dec( /* CRend binaural renderer handle */ ivas_HRTF_CRend_binary_close( &st_ivas->hSetOfHRTF ); #ifdef FIX_1720_HRTF_FASTCONV /* Fastconv HRTF memories */ ivas_binaural_hrtf_close( &st_ivas->hHrtfFastConv ); #endif /* Fastconv HRTF filters */ Loading
lib_rend/ivas_stat_rend.h +3 −2 Original line number Diff line number Diff line Loading @@ -1378,9 +1378,10 @@ typedef struct ivas_hrtfs_fastconv_struct float ***rightHRIRReal_FOA; float ***rightHRIRImag_FOA; float FASTCONV_FOA_latency_s; BINAURAL_INPUT_AUDIO_CONFIG input_cfg_var; int16_t allocate_init_flag; int16_t nChannels; int16_t allocate_init_flag; /*Memory allocation flag 0: if the hrtf pointers are allocated at application level , 1: of allocated at ivas_binaural_hrtf_open() */ int16_t nChannels; /*Number of channels updated based on maximum of cicp table*/ #else #ifdef UPDATE_FASTCONV_SBA_FILTER float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA]; Loading
lib_util/hrtf_file_reader.c +2 −0 Original line number Diff line number Diff line Loading @@ -34,6 +34,7 @@ #include <string.h> #include "prot.h" #include "ivas_prot_rend.h" #ifdef FIX_1720_HRTF_FASTCONV #include "ivas_prot.h" #endif Loading Loading @@ -1544,6 +1545,7 @@ ivas_error load_fastconv_HRTF_from_binary( free( hrtf_data ); return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" ); } /* Create the HRTF reading the raw data from the binary file */ if ( ( create_fastconv_HRTF_from_rawdata( &hHrtfFastConv, hrtf_data, hrtf_header.rend_type, hrtf_header.input_cfg ) ) != IVAS_ERR_OK ) { Loading