From b45cbe9fe6dc02539da27f5a0b37f0ed1e834626 Mon Sep 17 00:00:00 2001 From: malenov Date: Wed, 17 Apr 2024 14:12:28 +0200 Subject: [PATCH 1/5] Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder --- lib_com/options.h | 1 + lib_dec/core_dec_init.c | 4 ++++ lib_enc/core_enc_init.c | 6 ++++++ 3 files changed, 11 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index a390324e60..e37a36b944 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -166,6 +166,7 @@ /* all switches in this category should start with "NONBE_" */ #define NONBE_FIX_1045_ISM_BITRATE_SWITCHING /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */ +#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */ /* ##################### End NON-BE switches ########################### */ diff --git a/lib_dec/core_dec_init.c b/lib_dec/core_dec_init.c index 8ed19f9de0..5a29a9b52f 100644 --- a/lib_dec/core_dec_init.c +++ b/lib_dec/core_dec_init.c @@ -150,7 +150,11 @@ void open_decoder_LPD( { st->gamma = GAMMA16k; } +#ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP + else if ( st->sr_core > INT_FS_16k || st->element_mode == IVAS_CPE_MDCT ) +#else else if ( st->sr_core > INT_FS_16k && st->element_mode == IVAS_CPE_MDCT ) +#endif { st->gamma = GAMMA16k; } diff --git a/lib_enc/core_enc_init.c b/lib_enc/core_enc_init.c index a43e9905d7..de25b7e809 100644 --- a/lib_enc/core_enc_init.c +++ b/lib_enc/core_enc_init.c @@ -458,6 +458,12 @@ static void init_core_sig_ana( { st->gamma = GAMMA16k; } +#ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP + else if ( st->sr_core > INT_FS_16k || st->element_mode == IVAS_CPE_MDCT ) + { + st->gamma = GAMMA16k; + } +#endif else { st->gamma = GAMMA1; -- GitLab From 4b5a03ffbec6731daf100995a42776ed73e202f2 Mon Sep 17 00:00:00 2001 From: malenov Date: Wed, 17 Apr 2024 15:40:11 +0200 Subject: [PATCH 2/5] maintain EVS BE --- lib_dec/core_dec_init.c | 2 +- lib_enc/core_enc_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_dec/core_dec_init.c b/lib_dec/core_dec_init.c index 5a29a9b52f..d689fdbd66 100644 --- a/lib_dec/core_dec_init.c +++ b/lib_dec/core_dec_init.c @@ -151,7 +151,7 @@ void open_decoder_LPD( st->gamma = GAMMA16k; } #ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP - else if ( st->sr_core > INT_FS_16k || st->element_mode == IVAS_CPE_MDCT ) + else if ( st->element_mode > EVS_MONO && ( st->sr_core > INT_FS_16k || st->element_mode == IVAS_CPE_MDCT ) ) #else else if ( st->sr_core > INT_FS_16k && st->element_mode == IVAS_CPE_MDCT ) #endif diff --git a/lib_enc/core_enc_init.c b/lib_enc/core_enc_init.c index de25b7e809..54a82e999c 100644 --- a/lib_enc/core_enc_init.c +++ b/lib_enc/core_enc_init.c @@ -459,7 +459,7 @@ static void init_core_sig_ana( st->gamma = GAMMA16k; } #ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP - else if ( st->sr_core > INT_FS_16k || st->element_mode == IVAS_CPE_MDCT ) + else if ( st->element_mode > EVS_MONO && ( st->sr_core > INT_FS_16k || st->element_mode == IVAS_CPE_MDCT ) ) { st->gamma = GAMMA16k; } -- GitLab From c561b305bca3795afefef036b55e0beba1562072 Mon Sep 17 00:00:00 2001 From: malenov Date: Thu, 18 Apr 2024 09:58:51 +0200 Subject: [PATCH 3/5] restrict fix to decoder only and remove superfluous condition involving IVAS_CPE_MDCT --- lib_dec/core_dec_init.c | 2 +- lib_dec/ivas_mdct_core_dec.c | 2 ++ lib_enc/core_enc_init.c | 6 ------ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib_dec/core_dec_init.c b/lib_dec/core_dec_init.c index d689fdbd66..e2000d5749 100644 --- a/lib_dec/core_dec_init.c +++ b/lib_dec/core_dec_init.c @@ -151,7 +151,7 @@ void open_decoder_LPD( st->gamma = GAMMA16k; } #ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP - else if ( st->element_mode > EVS_MONO && ( st->sr_core > INT_FS_16k || st->element_mode == IVAS_CPE_MDCT ) ) + else if ( st->element_mode > EVS_MONO && st->sr_core > INT_FS_16k ) #else else if ( st->sr_core > INT_FS_16k && st->element_mode == IVAS_CPE_MDCT ) #endif diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec.c index 3f8ff738c7..e999abbc4b 100644 --- a/lib_dec/ivas_mdct_core_dec.c +++ b/lib_dec/ivas_mdct_core_dec.c @@ -110,7 +110,9 @@ static void dec_prm_tcx_sidebits( CONTEXT_HM_CONFIG hm_cfg; int16_t start_bit_pos; #ifdef DEBUG_MODE_TCX +#ifndef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP int16_t bits_common; +#endif static FILE *pF = NULL; if ( pF == NULL ) pF = fopen( "./res/stereo_tcx_dec_ind.txt", "w" ); diff --git a/lib_enc/core_enc_init.c b/lib_enc/core_enc_init.c index 54a82e999c..a43e9905d7 100644 --- a/lib_enc/core_enc_init.c +++ b/lib_enc/core_enc_init.c @@ -458,12 +458,6 @@ static void init_core_sig_ana( { st->gamma = GAMMA16k; } -#ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP - else if ( st->element_mode > EVS_MONO && ( st->sr_core > INT_FS_16k || st->element_mode == IVAS_CPE_MDCT ) ) - { - st->gamma = GAMMA16k; - } -#endif else { st->gamma = GAMMA1; -- GitLab From ca39c7a21e2cd082c49a493b45f7fff962dc0d62 Mon Sep 17 00:00:00 2001 From: malenov Date: Tue, 23 Apr 2024 10:11:22 +0200 Subject: [PATCH 4/5] cleanup --- lib_dec/ivas_mdct_core_dec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec.c index e999abbc4b..3f8ff738c7 100644 --- a/lib_dec/ivas_mdct_core_dec.c +++ b/lib_dec/ivas_mdct_core_dec.c @@ -110,9 +110,7 @@ static void dec_prm_tcx_sidebits( CONTEXT_HM_CONFIG hm_cfg; int16_t start_bit_pos; #ifdef DEBUG_MODE_TCX -#ifndef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP int16_t bits_common; -#endif static FILE *pF = NULL; if ( pF == NULL ) pF = fopen( "./res/stereo_tcx_dec_ind.txt", "w" ); -- GitLab From 1fc96358fffcb68221136bf7bcbe70a7bcaf2677 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Thu, 25 Apr 2024 17:00:09 +0200 Subject: [PATCH 5/5] do not apply string limit check in enc/dec commented lines --- ci/check_self_test_names.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/check_self_test_names.py b/ci/check_self_test_names.py index 18943e918d..3dea1a1200 100644 --- a/ci/check_self_test_names.py +++ b/ci/check_self_test_names.py @@ -45,7 +45,7 @@ if __name__ == "__main__": if skiplines > 0: skiplines = skiplines - 1 else: - if "//" in line and len(line) > args.max_length: + if "//" in line and all(x not in line for x in ["IVAS_cod", "IVAS_dec", "IVAS_rend"]) and len(line) > args.max_length: exceeded.append(line) if exceeded: -- GitLab