From 935c1b1201c4fb6ade4f18ce3e9bde3df7f8ad8a Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 6 May 2025 11:12:24 +0200 Subject: [PATCH 1/5] Accept FIX_954_OTR_REF_VEC --- lib_com/options.h | 1 - lib_rend/ivas_orient_trk_fx.c | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index f95812127..5eccfd54c 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -67,7 +67,6 @@ #define BASOP_NOGLOB_DECLARE_LOCAL #endif -#define FIX_954_OTR_REF_VEC /* FhG: Fix forward vector direction for OTR REF VEC mode */ #define FIX_867_CLDFB_NRG_SCALE #define FIX_1378_ACELP_OUT_OF_BOUNDS diff --git a/lib_rend/ivas_orient_trk_fx.c b/lib_rend/ivas_orient_trk_fx.c index da2891bb7..16d2fcc73 100644 --- a/lib_rend/ivas_orient_trk_fx.c +++ b/lib_rend/ivas_orient_trk_fx.c @@ -799,11 +799,7 @@ ivas_error ivas_orient_trk_SetReferenceVector_fx( 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_fx( refPos, listenerPos ); -#else - acousticFrontVector = VectorSubtract_fx( listenerPos, refPos ); -#endif BREAK; case IVAS_HEAD_ORIENT_TRK_REF_VEC_LEV: /* ignore the height difference between listener position and reference position */ @@ -830,11 +826,7 @@ ivas_error ivas_orient_trk_SetReferenceVector_fx( refPosLevel.q_fact = q_min; move16(); -#ifdef FIX_954_OTR_REF_VEC acousticFrontVector = VectorSubtract_fx( refPosLevel, listenerPosLevel ); -#else - acousticFrontVector = VectorSubtract_fx( listenerPosLevel, refPosLevel ); -#endif BREAK; default: return IVAS_ERR_WRONG_PARAMS; @@ -851,11 +843,7 @@ ivas_error ivas_orient_trk_SetReferenceVector_fx( return IVAS_ERR_WRONG_PARAMS; } -#ifdef FIX_954_OTR_REF_VEC ivasForwardVector.x_fx = ONE_IN_Q31; -#else - ivasForwardVector.x_fx = L_negate( ONE_IN_Q31 ); -#endif move32(); ivasForwardVector.y_fx = 0; move32(); -- GitLab From 1f6521eccd4d350ae11084a78ad291f3046cfa5b Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 6 May 2025 11:13:43 +0200 Subject: [PATCH 2/5] Accept FIX_957_REMOVE_PANNING_DEAD_CODE --- lib_com/options.h | 1 - lib_dec/ivas_jbm_dec_fx.c | 8 -------- 2 files changed, 9 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 5eccfd54c..12ef89495 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -96,7 +96,6 @@ #define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA /* Nokia: issue 944: fix FEC error in OMASA */ #define NONBE_FIX_949_MC_5MS_FRAMING /*Dlb: Issue 949: fix for 5ms framing/rendering in MC mode */ #define NONBE_FIX_952_MC_PARAMUPMIX_5MS /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/ -#define FIX_957_REMOVE_PANNING_DEAD_CODE /* VA: Remove obsolete non-diegetic panning related code. */ #define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER /* Qualcomm: issue 953: fix order or ER channels in LC mode*/ #define FIX_955_FASTCONV_REND_IN_ISM /* VA: put FastConv rendering call under DEBUGGING */ #define NONBE_FIX_967_ISM_MONO_DMX /* FhG: issue 967: accumulating energies in ISM mono DMX */ diff --git a/lib_dec/ivas_jbm_dec_fx.c b/lib_dec/ivas_jbm_dec_fx.c index 304a85342..8b606f7d0 100644 --- a/lib_dec/ivas_jbm_dec_fx.c +++ b/lib_dec/ivas_jbm_dec_fx.c @@ -1952,14 +1952,6 @@ ivas_error ivas_jbm_dec_render_fx( { ivas_dirac_dec_binaural_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, st_ivas->nchan_transport, p_output_fx ); } -#ifndef FIX_957_REMOVE_PANNING_DEAD_CODE - ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_NON_DIEGETIC_DOWNMIX ) ) - { - *nSamplesRendered = s_min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal ); - move16(); - ivas_apply_non_diegetic_panning_fx( p_output_fx, st_ivas->hDecoderConfig->non_diegetic_pan_gain_fx, *nSamplesRendered ); - } -#endif ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_PARAM_ISM ) || EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) ) { ivas_param_ism_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx ); -- GitLab From 371c483e64b4f2122131a48f403a1c24c1a03a2b Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 6 May 2025 11:13:53 +0200 Subject: [PATCH 3/5] 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 5d126a27e..37e3cc760 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -1289,7 +1289,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++ ) @@ -1307,9 +1306,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 12ef89495..92b93ebd4 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -100,7 +100,6 @@ #define FIX_955_FASTCONV_REND_IN_ISM /* VA: put FastConv rendering call under DEBUGGING */ #define NONBE_FIX_967_ISM_MONO_DMX /* FhG: issue 967: accumulating energies in ISM mono DMX */ -#define FIX_956_DECODER_COMMAND_LINE_FIX /* VA: Output correct error message when the decoder command-line has too many mandatory arguments. */ #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*/ /* #################### End BASOP porting switches ############################ */ -- GitLab From 4231c17b9ae06061398bf0c9cc83b82cb6d7a13c Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 6 May 2025 11:14:08 +0200 Subject: [PATCH 4/5] 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_fx.c | 3 --- lib_enc/ivas_omasa_enc_fx.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 e65ecc2cf..5ceac3b03 100644 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -360,9 +360,7 @@ typedef enum #define ISM_Q_STEP_BORDER 5.0f #define ISM_Q_STEP_BORDER_FX ( 20971520 ) // Q22 -#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 92b93ebd4..07b7db03b 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -93,7 +93,6 @@ #define FIX_1372_ISAR_POST_REND #endif #define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */ -#define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA /* Nokia: issue 944: fix FEC error in OMASA */ #define NONBE_FIX_949_MC_5MS_FRAMING /*Dlb: Issue 949: fix for 5ms framing/rendering in MC mode */ #define NONBE_FIX_952_MC_PARAMUPMIX_5MS /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/ #define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER /* Qualcomm: issue 953: fix order or ER channels in LC mode*/ diff --git a/lib_enc/ivas_ism_metadata_enc_fx.c b/lib_enc/ivas_ism_metadata_enc_fx.c index 589210cef..0cd435306 100644 --- a/lib_enc/ivas_ism_metadata_enc_fx.c +++ b/lib_enc/ivas_ism_metadata_enc_fx.c @@ -54,9 +54,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_FEC_DIFF_Q22 41943040 #define ISM_MD_INC_DIFF_CNT_MAX 6 diff --git a/lib_enc/ivas_omasa_enc_fx.c b/lib_enc/ivas_omasa_enc_fx.c index f3c461fa3..265f2b601 100644 --- a/lib_enc/ivas_omasa_enc_fx.c +++ b/lib_enc/ivas_omasa_enc_fx.c @@ -45,13 +45,11 @@ #endif -#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA /*------------------------------------------------------------------------- * Local constants *------------------------------------------------------------------------*/ #define OMASA_FEC_MAX 5 -#endif /*------------------------------------------------------------------------- * Local function prototypes @@ -192,10 +190,8 @@ ivas_error ivas_omasa_enc_open_fx( hOMasa->prev_selected_object = 0; hOMasa->changing_object = 0; -#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA hOMasa->since_obj_change_cnt = 0; move16(); -#endif move16(); move16(); @@ -661,7 +657,6 @@ void ivas_omasa_enc_fx( move16(); } -#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA /* force absolute MD coding in case of change of separated object */ IF( NE_16( hOMasa->prev_selected_object, selected_object ) ) { @@ -680,7 +675,6 @@ void ivas_omasa_enc_fx( move16(); } } -#endif hOMasa->prev_selected_object = selected_object; move16(); diff --git a/lib_enc/ivas_stat_enc.h b/lib_enc/ivas_stat_enc.h index f5dddcb77..a2247c7a4 100644 --- a/lib_enc/ivas_stat_enc.h +++ b/lib_enc/ivas_stat_enc.h @@ -873,9 +873,7 @@ typedef struct ivas_omasa_enc_state_structure Word16 prev_selected_object; UWord8 changing_object; -#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA Word16 since_obj_change_cnt; -#endif } OMASA_ENC_STATE, *OMASA_ENC_HANDLE; -- GitLab From 7a0c4e2b8eb92c142071b1b5320812fa572c77e0 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 6 May 2025 11:14:16 +0200 Subject: [PATCH 5/5] Accept NONBE_FIX_949_MC_5MS_FRAMING --- lib_com/options.h | 1 - lib_dec/ivas_jbm_dec_fx.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 07b7db03b..71e860604 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -93,7 +93,6 @@ #define FIX_1372_ISAR_POST_REND #endif #define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */ -#define NONBE_FIX_949_MC_5MS_FRAMING /*Dlb: Issue 949: fix for 5ms framing/rendering in MC mode */ #define NONBE_FIX_952_MC_PARAMUPMIX_5MS /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/ #define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER /* Qualcomm: issue 953: fix order or ER channels in LC mode*/ #define FIX_955_FASTCONV_REND_IN_ISM /* VA: put FastConv rendering call under DEBUGGING */ diff --git a/lib_dec/ivas_jbm_dec_fx.c b/lib_dec/ivas_jbm_dec_fx.c index 8b606f7d0..88cba4da4 100644 --- a/lib_dec/ivas_jbm_dec_fx.c +++ b/lib_dec/ivas_jbm_dec_fx.c @@ -2255,12 +2255,10 @@ ivas_error ivas_jbm_dec_render_fx( ELSE IF( EQ_32( 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_fx[n] = &st_ivas->hTcBuffer->tc_fx[n][st_ivas->hTcBuffer->n_samples_rendered]; } -#endif IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCT ) ) { -- GitLab