From 008f08dd385d0a83f2c703e4896e41bc791de4af Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Mon, 29 Jan 2024 11:14:39 +0100 Subject: [PATCH 1/8] [cleanup] accept FIX_954_OTR_REF_VEC --- lib_com/options.h | 1 - lib_rend/ivas_orient_trk.c | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 94b49b8481..b4184f36bf 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -150,7 +150,6 @@ /*#define FIX_I4_OL_PITCH*/ /* fix open-loop pitch used for EVS core switching */ /*#define SPLIT_REND_WITH_HEAD_ROT */ /* Dlb,FhG: Split Rendering contributions 21 and 35 */ -#define FIX_954_OTR_REF_VEC /* FhG: Fix forward vector direction for OTR REF VEC mode */ #define FIX_638_ENERGIE_IAC_ROM_TABLES /* Orange : Missing left/right and coherence late reverb tables in binary format*/ #define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */ diff --git a/lib_rend/ivas_orient_trk.c b/lib_rend/ivas_orient_trk.c index f4332a3b68..0f2c694875 100644 --- a/lib_rend/ivas_orient_trk.c +++ b/lib_rend/ivas_orient_trk.c @@ -545,11 +545,7 @@ ivas_error ivas_orient_trk_SetReferenceVector( case IVAS_HEAD_ORIENT_TRK_REF: case IVAS_HEAD_ORIENT_TRK_AVG: case IVAS_HEAD_ORIENT_TRK_REF_VEC: -#ifdef FIX_954_OTR_REF_VEC acousticFrontVector = VectorSubtract( refPos, listenerPos ); -#else - acousticFrontVector = VectorSubtract( listenerPos, refPos ); -#endif break; case IVAS_HEAD_ORIENT_TRK_REF_VEC_LEV: /* ignore the height difference between listener position and reference position */ @@ -558,11 +554,7 @@ ivas_error ivas_orient_trk_SetReferenceVector( listenerPosLevel.y = listenerPos.y; refPosLevel.x = refPos.x; refPosLevel.y = refPos.y; -#ifdef FIX_954_OTR_REF_VEC acousticFrontVector = VectorSubtract( refPosLevel, listenerPosLevel ); -#else - acousticFrontVector = VectorSubtract( listenerPosLevel, refPosLevel ); -#endif break; default: return IVAS_ERR_WRONG_PARAMS; @@ -576,11 +568,7 @@ ivas_error ivas_orient_trk_SetReferenceVector( return IVAS_ERR_WRONG_PARAMS; } -#ifdef FIX_954_OTR_REF_VEC ivasForwardVector.x = 1.0f; -#else - ivasForwardVector.x = -1.0f; -#endif ivasForwardVector.y = 0.0f; ivasForwardVector.z = 0.0f; VectorRotationToQuaternion( ivasForwardVector, acousticFrontVector, &pOTR->refRot ); -- GitLab From ec160a3e874b9d3beb5f49c5a7ee71fd56530060 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Mon, 29 Jan 2024 11:16:02 +0100 Subject: [PATCH 2/8] [cleanup] accept FIX_WARNING_RENDER_CONFIG --- lib_com/options.h | 1 - lib_util/render_config_reader.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index b4184f36bf..6b3f64d006 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -152,7 +152,6 @@ /*#define SPLIT_REND_WITH_HEAD_ROT */ /* Dlb,FhG: Split Rendering contributions 21 and 35 */ #define FIX_638_ENERGIE_IAC_ROM_TABLES /* Orange : Missing left/right and coherence late reverb tables in binary format*/ -#define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */ #define FIX_WARNING_SPLIT_RENDER /* Orange: fix warning on windows build vscode */ #define FIX_INV_DIFFUSE_WEIGHT /* Orange : Fix error in energy compensation in late binaural reverb*/ #define FIX_20_MS_FRAME_LEN_TABLES_CONVERTER /* Orange : generate_tables_converter tools can generate rom for 5 and 20 ms frame length */ diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index 369de3b310..e5101cfe92 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -435,11 +435,7 @@ static ivas_error read_bin_bits( *pTarget = 0; for ( n = 0; n < nBits; n++ ) { -#ifdef FIX_WARNING_RENDER_CONFIG nByte = (uint32_t) ( ( this->readOffset + n ) >> 3 ); -#else - nByte = ( this->readOffset + n ) >> 3; -#endif bit = this->pBitstream[nByte] >> ( 7 - ( ( this->readOffset + n ) % 8 ) ) & 1; *pTarget = ( *pTarget << 1 ) + bit; } -- GitLab From 9aae73ecb7f82b9bc7dbad1e2bc87a23eb85aa8b Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Mon, 29 Jan 2024 11:16:56 +0100 Subject: [PATCH 3/8] [cleanup] accept FIX_958_667_DISABLE_INITIAL_PLC_SUPPRESSION --- lib_com/options.h | 1 - lib_dec/lib_dec.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 6b3f64d006..779b30d980 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -155,7 +155,6 @@ #define FIX_WARNING_SPLIT_RENDER /* Orange: fix warning on windows build vscode */ #define FIX_INV_DIFFUSE_WEIGHT /* Orange : Fix error in energy compensation in late binaural reverb*/ #define FIX_20_MS_FRAME_LEN_TABLES_CONVERTER /* Orange : generate_tables_converter tools can generate rom for 5 and 20 ms frame length */ -#define FIX_958_667_DISABLE_INITIAL_PLC_SUPPRESSION /* Ericsson: Fix related to issue 667 in IVAS BASOP. Handling of initial lost frame in IVAS causes non-BE on EVS BASOP 26.444 */ #define FIX_957_REMOVE_PANNING_DEAD_CODE /* VA: Remove obsolete non-diegetic panning related code. */ #define FIX_956_DECODER_COMMAND_LINE_FIX /* VA: Output correct error message when the decoder command-line has too many mandatory arguments. */ #define FIX_955_FASTCONV_REND_IN_ISM /* VA: put FastConv rendering call under DEBUGGING */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 5ed7a54eae..6b55d4322b 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -216,9 +216,7 @@ ivas_error IVAS_DEC_Open( st_ivas->transport_config = IVAS_AUDIO_CONFIG_INVALID; st_ivas->intern_config = IVAS_AUDIO_CONFIG_INVALID; st_ivas->writeFECoffset = 0; -#ifdef FIX_958_667_DISABLE_INITIAL_PLC_SUPPRESSION hIvasDec->hasDecodedFirstGoodFrame = true; /* Functionality to suppress output for initial lost frames is disabled in EVS operation */ -#endif return IVAS_ERR_OK; } -- GitLab From 28656078cd6fde1f88b149c21d3af9ac970c106c Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Mon, 29 Jan 2024 11:17:41 +0100 Subject: [PATCH 4/8] [cleanup] accept FIX_957_REMOVE_PANNING_DEAD_CODE --- lib_com/options.h | 1 - lib_dec/ivas_jbm_dec.c | 7 ------- 2 files changed, 8 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 779b30d980..07effcb341 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -155,7 +155,6 @@ #define FIX_WARNING_SPLIT_RENDER /* Orange: fix warning on windows build vscode */ #define FIX_INV_DIFFUSE_WEIGHT /* Orange : Fix error in energy compensation in late binaural reverb*/ #define FIX_20_MS_FRAME_LEN_TABLES_CONVERTER /* Orange : generate_tables_converter tools can generate rom for 5 and 20 ms frame length */ -#define FIX_957_REMOVE_PANNING_DEAD_CODE /* VA: Remove obsolete non-diegetic panning related code. */ #define FIX_956_DECODER_COMMAND_LINE_FIX /* VA: Output correct error message when the decoder command-line has too many mandatory arguments. */ #define FIX_955_FASTCONV_REND_IN_ISM /* VA: put FastConv rendering call under DEBUGGING */ diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 1b09291125..2093a95ac5 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -1042,13 +1042,6 @@ ivas_error ivas_jbm_dec_render( { ivas_dirac_dec_binaural_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, st_ivas->nchan_transport, p_output ); } -#ifndef FIX_957_REMOVE_PANNING_DEAD_CODE - else if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX ) - { - *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal ); - ivas_apply_non_diegetic_panning( p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered ); - } -#endif else if ( st_ivas->renderer_type == RENDERER_PARAM_ISM || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) { ivas_param_ism_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output ); -- GitLab From 433a95f560b5f9b31d0339314c4ac5d13b9ae775 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Mon, 29 Jan 2024 11:22:22 +0100 Subject: [PATCH 5/8] [cleanup] accept FIX_956_DECODER_COMMAND_LINE_FIX --- apps/decoder.c | 4 ---- lib_com/options.h | 1 - 2 files changed, 5 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index 1e41f9054f..c93d717250 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -1589,7 +1589,6 @@ static bool parseCmdlIVAS_dec( * Mandatory input arguments *-----------------------------------------------------------------*/ -#ifdef FIX_956_DECODER_COMMAND_LINE_FIX if ( i < argc - 4 ) { for ( i = 1; i < argc; i++ ) @@ -1607,9 +1606,6 @@ static bool parseCmdlIVAS_dec( return false; } else if ( i < argc - 3 ) -#else - if ( i < argc - 3 ) -#endif { arg->outputConfig = cmdline2config( argv[i] ); if ( arg->outputConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM ) diff --git a/lib_com/options.h b/lib_com/options.h index 07effcb341..5de867a956 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -155,7 +155,6 @@ #define FIX_WARNING_SPLIT_RENDER /* Orange: fix warning on windows build vscode */ #define FIX_INV_DIFFUSE_WEIGHT /* Orange : Fix error in energy compensation in late binaural reverb*/ #define FIX_20_MS_FRAME_LEN_TABLES_CONVERTER /* Orange : generate_tables_converter tools can generate rom for 5 and 20 ms frame length */ -#define FIX_956_DECODER_COMMAND_LINE_FIX /* VA: Output correct error message when the decoder command-line has too many mandatory arguments. */ #define FIX_955_FASTCONV_REND_IN_ISM /* VA: put FastConv rendering call under DEBUGGING */ /* #################### End BE switches ################################## */ -- GitLab From cd39966cf411c7ad7adb6a9842b01fd750684320 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Mon, 29 Jan 2024 11:23:20 +0100 Subject: [PATCH 6/8] [cleanup] accept NONBE_FIX_856_TCX_LTP_SYNTH_FILTER --- lib_com/options.h | 1 - lib_com/tcx_ltp.c | 9 --------- 2 files changed, 10 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 5de867a956..777e588cf6 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -165,7 +165,6 @@ #define NONBE_FIX_BINARY_BINAURAL_READING /* Orange: Add support for reading binaural binary file */ #define NONBE_FIX_AVG_IAC_CLDFB_REVERB /* Orange: Add computation avg energy and iac tables for rom and binaural binary file */ -#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/ #define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA /* Nokia: issue 944: fix FEC error in OMASA */ #define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER /* Qualcomm: issue 953: fix order or ER channels in LC mode*/ #define NONBE_FIX_949_MC_5MS_FRAMING /* Dlb: issue 949: fix for issue 949, distorted output in MC mode with 5ms framing*/ diff --git a/lib_com/tcx_ltp.c b/lib_com/tcx_ltp.c index 502328348d..1711ad24b3 100755 --- a/lib_com/tcx_ltp.c +++ b/lib_com/tcx_ltp.c @@ -740,11 +740,7 @@ static void tcx_ltp_synth_filter_11_unequal_pitch( gain = prev_gain; gain_step = -prev_gain / length; -#ifdef NONBE_FIX_856_TCX_LTP_SYNTH_FILTER for ( j = 0; j < length; j++ ) -#else - for ( j = 0; j < length + L; j++ ) -#endif { s = 0; s2 = 0; @@ -765,14 +761,9 @@ static void tcx_ltp_synth_filter_11_unequal_pitch( gain += gain_step; } -#ifdef NONBE_FIX_856_TCX_LTP_SYNTH_FILTER mvr2r( out - L, temp_buf, length + L ); mvr2r( in + length, temp_buf + length + L, L ); temp_ptr = &temp_buf[0] + L; -#else - mvr2r( out - MAX_TCX_LTP_FILTER_LEN, temp_buf, MAX_TRANSITION_LEN + 2 * MAX_TCX_LTP_FILTER_LEN ); - temp_ptr = &temp_buf[0] + MAX_TCX_LTP_FILTER_LEN; -#endif m0 = temp_ptr; m1 = temp_ptr - 1; -- GitLab From 17bbc1c7585f28bafa81fd0bc162845ccded6deb Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Mon, 29 Jan 2024 11:24:12 +0100 Subject: [PATCH 7/8] [cleanup] accept NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA --- lib_com/ivas_cnst.h | 2 -- lib_com/options.h | 1 - lib_enc/ivas_ism_metadata_enc.c | 3 --- lib_enc/ivas_omasa_enc.c | 6 ------ lib_enc/ivas_stat_enc.h | 2 -- 5 files changed, 14 deletions(-) diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index af3fbb8932..38e9518e61 100755 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -328,9 +328,7 @@ typedef enum #define ISM_Q_STEP 2.5f #define ISM_Q_STEP_BORDER 5.0f -#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA #define ISM_FEC_MAX 10 -#endif #define ISM_RADIUS_NBITS 6 #define ISM_RADIUS_MIN 0.0f diff --git a/lib_com/options.h b/lib_com/options.h index 777e588cf6..72da6c2ff7 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -165,7 +165,6 @@ #define NONBE_FIX_BINARY_BINAURAL_READING /* Orange: Add support for reading binaural binary file */ #define NONBE_FIX_AVG_IAC_CLDFB_REVERB /* Orange: Add computation avg energy and iac tables for rom and binaural binary file */ -#define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA /* Nokia: issue 944: fix FEC error in OMASA */ #define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER /* Qualcomm: issue 953: fix order or ER channels in LC mode*/ #define NONBE_FIX_949_MC_5MS_FRAMING /* Dlb: issue 949: fix for issue 949, distorted output in MC mode with 5ms framing*/ #define NONBE_FIX_952_MC_PARAMUPMIX_5MS /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/ diff --git a/lib_enc/ivas_ism_metadata_enc.c b/lib_enc/ivas_ism_metadata_enc.c index 3b23359850..3e452b1ebc 100644 --- a/lib_enc/ivas_ism_metadata_enc.c +++ b/lib_enc/ivas_ism_metadata_enc.c @@ -55,9 +55,6 @@ #define ISM_MAX_ELEVATION_DIFF_IDX ( ISM_ELEVATION_NBITS - 1 /*zero*/ - 1 /*sign*/ ) #define ISM_MAX_RADIUS_DIFF_IDX ( ISM_RADIUS_NBITS - 1 /*zero*/ - 1 /*sign*/ ) -#ifndef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA -#define ISM_FEC_MAX 10 -#endif #define ISM_MD_FEC_DIFF 10 #define ISM_MD_INC_DIFF_CNT_MAX 6 #define ISM_MD_FEC_CNT_MAX 25 diff --git a/lib_enc/ivas_omasa_enc.c b/lib_enc/ivas_omasa_enc.c index b5382f9060..7e17c87c26 100644 --- a/lib_enc/ivas_omasa_enc.c +++ b/lib_enc/ivas_omasa_enc.c @@ -45,13 +45,11 @@ #include "wmc_auto.h" -#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA /*------------------------------------------------------------------------- * Local constants *------------------------------------------------------------------------*/ #define OMASA_FEC_MAX 5 -#endif /*------------------------------------------------------------------------- * Local function prototypes @@ -141,9 +139,7 @@ ivas_error ivas_omasa_enc_open( set_zero( hOMasa->broadband_energy_prev, MAX_NUM_OBJECTS + MASA_MAX_TRANSPORT_CHANNELS ); hOMasa->prev_selected_object = 0; hOMasa->changing_object = 0; -#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA hOMasa->since_obj_change_cnt = 0; -#endif input_frame = (int16_t) ( st_ivas->hEncoderConfig->input_Fs / FRAMES_PER_SEC ); for ( i = 0; i < input_frame; i++ ) @@ -507,7 +503,6 @@ void ivas_omasa_enc( hOMasa->broadband_energy_prev[i] = broadband_energy[i]; } -#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA /* force absolute MD coding in case of change of separated object */ if ( hOMasa->prev_selected_object != selected_object ) { @@ -523,7 +518,6 @@ void ivas_omasa_enc( hIsmMeta[0]->position_angle.angle1_diff_cnt = ISM_FEC_MAX; } } -#endif hOMasa->prev_selected_object = selected_object; /* Separate the selected object */ diff --git a/lib_enc/ivas_stat_enc.h b/lib_enc/ivas_stat_enc.h index 181fe5316b..a4583f1ad5 100644 --- a/lib_enc/ivas_stat_enc.h +++ b/lib_enc/ivas_stat_enc.h @@ -788,9 +788,7 @@ typedef struct ivas_omasa_enc_state_structure float broadband_energy_prev[MAX_NUM_OBJECTS + MASA_MAX_TRANSPORT_CHANNELS]; int16_t prev_selected_object; uint8_t changing_object; -#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA int16_t since_obj_change_cnt; -#endif float fade_out_gain[L_FRAME48k]; float fade_in_gain[L_FRAME48k]; -- GitLab From a7e9b9c474fd804856119d0d0068fd498dbfe79b Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Mon, 29 Jan 2024 11:24:56 +0100 Subject: [PATCH 8/8] [cleanup] accept NONBE_FIX_949_MC_5MS_FRAMING --- lib_com/options.h | 1 - lib_dec/ivas_jbm_dec.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 72da6c2ff7..e5f3428659 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -166,7 +166,6 @@ #define NONBE_FIX_BINARY_BINAURAL_READING /* Orange: Add support for reading binaural binary file */ #define NONBE_FIX_AVG_IAC_CLDFB_REVERB /* Orange: Add computation avg energy and iac tables for rom and binaural binary file */ #define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER /* Qualcomm: issue 953: fix order or ER channels in LC mode*/ -#define NONBE_FIX_949_MC_5MS_FRAMING /* Dlb: issue 949: fix for issue 949, distorted output in MC mode with 5ms framing*/ #define NONBE_FIX_952_MC_PARAMUPMIX_5MS /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/ #define NONBE_FIX_967_ISM_MONO_DMX /* FhG: issue 967: accumulating energies in ISM mono DMX */ #define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/ diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 2093a95ac5..dc6ba92177 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -1279,12 +1279,10 @@ ivas_error ivas_jbm_dec_render( } else if ( st_ivas->ivas_format == MC_FORMAT ) { -#ifdef NONBE_FIX_949_MC_5MS_FRAMING for ( n = 0; n < st_ivas->hTcBuffer->nchan_buffer_full; n++ ) { p_tc[n] = &st_ivas->hTcBuffer->tc[n][st_ivas->hTcBuffer->n_samples_rendered]; } -#endif if ( st_ivas->mc_mode == MC_MODE_MCT ) { int16_t crendInPlaceRotation = FALSE; -- GitLab