From 9dde5cb3987a0ca4a65becd4568d478e20f466fd Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Tue, 26 Jul 2022 13:29:19 +0200 Subject: [PATCH 1/4] modify energy-compensation gains in DirAC under DIRAC_DRCT_GAIN_TUNING --- lib_com/options.h | 6 ++---- lib_dec/ivas_dirac_output_synthesis_dec.c | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 5104c46ae9..5a3e09fe60 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -148,15 +148,13 @@ /*#define FIX_IVAS_185_MDCT_ST_PLC_FADEOUT*/ /* IVAS-185 fix bug in TCX-PLC fadeout for MDCT-Stereo and improve fadeout by fading to background noise instead of white noise */ /*#define FIX_I1_113*/ /* under review : MCT bit distribution optimization for SBA high bitrates*/ - #define SIMPLIFY_SBA_RENDERING_LOGIC /* SBA rendering maintenance related to ticket #45 */ #define SBA_CLEANING /* SBA maintenance related to ticket #45 */ - - - #define REFACTOR_REVERB_INIT_ADD_CFG_CHECKS /* Simplify and improve reverb initialization + add range checks on config parameter values */ +#define DIRAC_DRCT_GAIN_TUNING + /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ #endif diff --git a/lib_dec/ivas_dirac_output_synthesis_dec.c b/lib_dec/ivas_dirac_output_synthesis_dec.c index 09ef51d056..6324e7c958 100644 --- a/lib_dec/ivas_dirac_output_synthesis_dec.c +++ b/lib_dec/ivas_dirac_output_synthesis_dec.c @@ -729,8 +729,13 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( g1 = 0.3679f + onset_filter[l] * ( 0.1175f - 0.3679f ); g2 = ( 1.f - g1 ) * *( p_gains_dir ); g2 += g1 * ( *( p_cy_cross_dir_smooth++ ) ); +#ifdef DIRAC_DRCT_GAIN_TUNING + g2 = max( g2, 0.85f ); + g2 = min( g2, 1.15f ); +#else g2 = max( g2, 0.5f ); g2 = min( g2, 2.f ); +#endif *( p_gains_dir++ ) = g2; } } -- GitLab From ebb3d6cc46ccc9a798669d6a46b51c1e067c1c83 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 27 Jul 2022 11:28:27 +0200 Subject: [PATCH 2/4] add report file to artifacts to debug zero_errors --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7aff1b478a..476555fe1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -225,6 +225,7 @@ self-test-on-merge-request: - test_output.txt - scripts/test/logs - scripts/ref/logs + - report-junit.xml reports: junit: report-junit.xml -- GitLab From ac2bab1d8afd5040c7f0c15475baead9d9f43577 Mon Sep 17 00:00:00 2001 From: kiene Date: Wed, 27 Jul 2022 09:41:25 +0000 Subject: [PATCH 3/4] upload artifacts also on failure --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 476555fe1d..e60df491ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -221,6 +221,7 @@ self-test-on-merge-request: exit_codes: - 123 artifacts: + when: always paths: - test_output.txt - scripts/test/logs -- GitLab From 3d8122ffced22f64bf45a1cbaa228805314f6dfc Mon Sep 17 00:00:00 2001 From: bohmr Date: Wed, 27 Jul 2022 10:14:39 +0000 Subject: [PATCH 4/4] changed zero_errors check --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e60df491ed..2e23dd9fc1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -212,7 +212,7 @@ self-test-on-merge-request: - exit_code=0 - python3 ./scripts/ivas_pytests/self_test_b.py --encref IVAS_cod_ref --decref IVAS_dec_ref --encdut IVAS_cod_test --decdut IVAS_dec_test || exit_code=$? - if [ $exit_code -eq 1 ] && [ $non_be_flag == 0 ]; then echo "pytest run had failures and non-BE flag not present"; exit $EXIT_CODE_FAIL; fi - - zero_errors=$(cat report-junit.xml | grep -c 'testsuite errors="0"') || true + - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true - if [ $exit_code -eq 1 ] && [ $zero_errors == 1 ]; then echo "pytest run had failures, but no errors and non-BE flag present"; exit $EXIT_CODE_NON_BE; fi - if [ $exit_code -ne 0 ]; then echo "pytest run had errors"; exit $EXIT_CODE_FAIL; fi; # return exit code from selftest if everything went well with the pytest run -- GitLab