From c58a8766f0b117c6850c4e16046ede16cb9a5827 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Wed, 10 Dec 2025 13:30:40 +0100 Subject: [PATCH 1/2] [cleanup] accept FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND --- lib_com/options.h | 1 - lib_rend/ivas_crend.c | 15 --------------- lib_util/hrtf_file_reader.c | 31 ------------------------------- 3 files changed, 47 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 3bc10a191e..ee41613840 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -162,7 +162,6 @@ /*#define FIX_I4_OL_PITCH*/ /* fix open-loop pitch used for EVS core switching */ #define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */ #define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */ -#define FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND /* OR : Fix issue basop 2201 hrtf_file_reader crend differs between basop ivas-main and ivas-float-update */ /* #################### End BE switches ################################## */ diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend.c index d7a5b8db2d..5341118e3c 100644 --- a/lib_rend/ivas_crend.c +++ b/lib_rend/ivas_crend.c @@ -65,14 +65,9 @@ ivas_error ivas_Crend_hrtf_init( } hHrtf->latency_s = 0; -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND hHrtf->gain_lfe = 0; -#endif hHrtf->max_num_ir = 0; hHrtf->max_num_iterations = 0; -#ifndef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND - hHrtf->gain_lfe = 0; -#endif hHrtf->index_frequency_max_diffuse = 0; hHrtf->same_inv_diffuse_weight = 1; @@ -85,11 +80,9 @@ ivas_error ivas_Crend_hrtf_init( hHrtf->pIndex_frequency_max[i][j] = NULL; hHrtf->pOut_to_bin_re[i][j] = NULL; hHrtf->pOut_to_bin_im[i][j] = NULL; -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND hHrtf->pOut_to_bin_re_dyn[i][j] = NULL; hHrtf->pOut_to_bin_im_dyn[i][j] = NULL; hHrtf->pIndex_frequency_max_dyn[i][j] = NULL; -#endif } } @@ -99,11 +92,9 @@ ivas_error ivas_Crend_hrtf_init( hHrtf->pIndex_frequency_max_diffuse[j] = NULL; hHrtf->pOut_to_bin_diffuse_re[j] = NULL; hHrtf->pOut_to_bin_diffuse_im[j] = NULL; -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND hHrtf->pIndex_frequency_max_diffuse_dyn[j] = NULL; hHrtf->pOut_to_bin_diffuse_re_dyn[j] = NULL; hHrtf->pOut_to_bin_diffuse_im_dyn[j] = NULL; -#endif } hHrtf->init_from_rom = 1; @@ -833,9 +824,7 @@ static ivas_error ivas_rend_initCrend( if ( hHrtf->inv_diffuse_weight[0][i] != hHrtf->inv_diffuse_weight[1][i] ) { hHrtf->same_inv_diffuse_weight = 0; -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND break; -#endif } } } @@ -1282,11 +1271,7 @@ ivas_error ivas_rend_openCrend( hCrend->freq_buffer_re_diffuse[1] = NULL; hCrend->freq_buffer_im_diffuse[1] = NULL; } -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND max_total_ir_len = (int32_t) ( hHrtf->latency_s * output_Fs + 0.5f ) + subframe_length; -#else - max_total_ir_len = (int16_t) ( hHrtf->latency_s * output_Fs + 0.5f ) + subframe_length; -#endif if ( max_total_ir_len > 0 ) { if ( ( hCrend->lfe_delay_line = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) diff --git a/lib_util/hrtf_file_reader.c b/lib_util/hrtf_file_reader.c index cb445dacab..e0cb53b09e 100644 --- a/lib_util/hrtf_file_reader.c +++ b/lib_util/hrtf_file_reader.c @@ -803,9 +803,7 @@ static ivas_error load_reverb_from_binary( { if ( hrtf_header.frequency != sampleRate ) { -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND free( hrtf_data ); -#endif return IVAS_ERR_INVALID_HRTF_SAMPLING_RATE; } } @@ -818,11 +816,7 @@ static ivas_error load_reverb_from_binary( hHrtfStatistics->average_energy_l_dyn = (float *) malloc( lr_iac_len * sizeof( float ) ); hHrtfStatistics->average_energy_r_dyn = (float *) malloc( lr_iac_len * sizeof( float ) ); hHrtfStatistics->inter_aural_coherence_dyn = (float *) malloc( lr_iac_len * sizeof( float ) ); -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND if ( hHrtfStatistics->average_energy_l_dyn == NULL || hHrtfStatistics->average_energy_r_dyn == NULL || hHrtfStatistics->inter_aural_coherence_dyn == NULL ) -#else - if ( hHrtfStatistics->average_energy_l_dyn == NULL || hHrtfStatistics->average_energy_l_dyn == NULL || hHrtfStatistics->inter_aural_coherence_dyn == NULL ) -#endif { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" ); } @@ -901,16 +895,11 @@ static ivas_error TDREND_MIX_LoadHRTF( ivas_hrtfs_header_t hrtf_header; int32_t hrtf_data_size_max; char *hrtf_data; -#ifndef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND - header_check_result = IVAS_ERR_OK; -#endif if ( f_hrtf == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND header_check_result = IVAS_ERR_OK; -#endif if ( ( header_check_result = read_and_check_hrtf_binary_file_header( &hrtfs_file_header, f_hrtf ) ) != IVAS_ERR_OK ) { @@ -956,17 +945,13 @@ static ivas_error TDREND_MIX_LoadHRTF( { if ( read_hrtf_binary_header( &hrtf_header, f_hrtf ) != IVAS_ERR_OK ) { -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND free( hrtf_data ); -#endif return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "HRTF binary file not compliant (number of HRTF)" ); } if ( ( header_check_result = check_hrtf_binary_header( &hrtf_header ) ) != IVAS_ERR_OK ) { -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND free( hrtf_data ); -#endif return header_check_result; } @@ -975,9 +960,7 @@ static ivas_error TDREND_MIX_LoadHRTF( { if ( fread( hrtf_data, 1, hrtf_header.data_size, f_hrtf ) != hrtf_header.data_size ) { -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND free( hrtf_data ); -#endif return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" ); } } @@ -985,9 +968,7 @@ static ivas_error TDREND_MIX_LoadHRTF( { if ( hrtf_header.frequency != sampleRate ) { -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND free( hrtf_data ); -#endif return IVAS_ERR_INVALID_HRTF_SAMPLING_RATE; } } @@ -1771,9 +1752,7 @@ ivas_error load_fastconv_HRTF_from_binary( { if ( hrtf_header.frequency != 48000 ) /* note: Parametric renderer data are always stored at 48 kHz */ { -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND free( hrtf_data ); -#endif return IVAS_ERR_INVALID_HRTF_SAMPLING_RATE; } @@ -1872,9 +1851,7 @@ ivas_error load_parambin_HRTF_from_binary( { if ( hrtf_header.frequency != 48000 ) /* note: Parametric renderer data are always stored at 48 kHz */ { -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND free( hrtf_data ); -#endif return IVAS_ERR_INVALID_HRTF_SAMPLING_RATE; } @@ -1932,9 +1909,7 @@ ivas_error load_Crend_HRTF_from_binary( ivas_hrtfs_file_header_t hrtfs_file_header; int16_t hrtf_id; bool load = false; -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND int16_t asCrend = 0; -#endif BINAURAL_INPUT_AUDIO_CONFIG hrtf_set_binaural_cfg; /* convert audio config. to HRTF binaural config */ @@ -1995,9 +1970,7 @@ ivas_error load_Crend_HRTF_from_binary( { if ( hrtf_header.frequency != sampleRate ) { -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND free( hrtf_data ); -#endif return IVAS_ERR_INVALID_HRTF_SAMPLING_RATE; } @@ -2012,9 +1985,7 @@ ivas_error load_Crend_HRTF_from_binary( free( hrtf_data ); return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Could not create HRTF from binary file" ); } -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND asCrend = 1; -#endif break; /* read just one set */ } else @@ -2024,7 +1995,6 @@ ivas_error load_Crend_HRTF_from_binary( } free( hrtf_data ); -#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND if ( asCrend ) { return IVAS_ERR_OK; @@ -2033,7 +2003,6 @@ ivas_error load_Crend_HRTF_from_binary( { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Could not create HRTF from binary file" ); } -#endif } -- GitLab From 1e6b8fcdf351f89d6ba3e2711fd56f63655f40c0 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Wed, 10 Dec 2025 13:32:58 +0100 Subject: [PATCH 2/2] whitespace only --- lib_com/options.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index ee41613840..0e6f20b90c 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -168,8 +168,6 @@ /* #################### Start NON-BE switches ############################ */ /* any switch which is non-be wrt. TS 26.258 V3.0 */ - - #define FIX_1435_MOVE_STEREO_PANNING /* VA: issue 1435: do the EVS stereo panning in the renderer */ #define FIX_1454_FIX_STEREO_TO_FOA_JBM /* VA: issue 1454: fix buggy stereo to FOA in JBM */ #define FIX_1461_CNG_BW_SWITCHING /* Eri: issue 1461: Stereo parameters are not updated when SID/NODATA forces BW to stay the same */ -- GitLab