From c5fbc8681ffde984a685a715ff4238ed82b9a6f3 Mon Sep 17 00:00:00 2001 From: vaclav Date: Mon, 16 Jun 2025 18:36:25 +0200 Subject: [PATCH] port NONBE_FIX_1028_1DB_TCX_LEVEL_DROP --- lib_com/options.h | 3 ++- lib_dec/core_dec_init_fx.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 4527c9c4b..ea980a6b7 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -128,7 +128,8 @@ #define FIX_998_UNUSED_FUNCTION /* FhG: issue 998: delete unused funtion ivas_dirac_dec_get_response_split_order */ #define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */ #define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */ - +#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP + /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */ /* #################### End BASOP porting switches ############################ */ #endif diff --git a/lib_dec/core_dec_init_fx.c b/lib_dec/core_dec_init_fx.c index eb34e1bc1..3888bd9f4 100644 --- a/lib_dec/core_dec_init_fx.c +++ b/lib_dec/core_dec_init_fx.c @@ -1272,7 +1272,11 @@ void open_decoder_LPD_ivas_fx( st->inv_gamma = GAMMA16k_INV; move16(); } +#ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP + ELSE IF( GT_16( st->element_mode, EVS_MONO ) && GT_32( st->sr_core, INT_FS_16k ) ) +#else ELSE IF( GT_32( st->sr_core, INT_FS_16k ) && EQ_16( st->element_mode, IVAS_CPE_MDCT ) ) +#endif { st->gamma = GAMMA16k; move16(); -- GitLab