From 3a568ca78e28a588a26d61c31331a140e3d8701b Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Wed, 24 Jan 2024 10:50:39 +0100 Subject: [PATCH 1/2] set nbands_coded to 11 in ivas_dirac_sba_config for 384 and 512 kbps --- lib_com/ivas_dirac_com.c | 2 ++ lib_com/options.h | 1 + 2 files changed, 3 insertions(+) diff --git a/lib_com/ivas_dirac_com.c b/lib_com/ivas_dirac_com.c index eb0408dceb..521baa1095 100644 --- a/lib_com/ivas_dirac_com.c +++ b/lib_com/ivas_dirac_com.c @@ -445,7 +445,9 @@ ivas_error ivas_dirac_sba_config( else { hQMetaData->useLowerBandRes = 0; +#ifndef NONBE_FIX_973_HODIRAC_BAND_GROUPING if ( hodirac_flag == 0 ) +#endif { nbands_coded = nbands - 1; /* always combine the last two bands */ } diff --git a/lib_com/options.h b/lib_com/options.h index 820383e905..55ded81827 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -176,6 +176,7 @@ #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_973_HODIRAC_BAND_GROUPING /* FhG: issue 973: empty parameter band in DirAC */ /* ##################### End NON-BE switches ########################### */ -- GitLab From ed2a527926b87c148c80702255d8d42edb948726 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Tue, 6 Feb 2024 17:29:13 +0100 Subject: [PATCH 2/2] Ignore metadata difference if get_mld is set and get_mld_lim is >0 --- .../test_masa_enc_dec.py | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py b/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py index 3c49f9f21c..c8338e4212 100644 --- a/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py +++ b/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py @@ -211,15 +211,19 @@ def test_masa_enc_dec( mld = float(reason.split(':')[1].split()[0]) record_property("MLD",mld) - # Fail if compare fails compare result - if metacmp_res == False and pcmcmp_res != 0: - pytest.fail("Metadata and transport output difference detected") - elif metacmp_res == False: - pytest.fail("Metadata output difference detected") - elif pcmcmp_res != 0: - pytest.fail("Transport output difference detected") + if get_mld and get_mld_lim > 0: + if pcmcmp_res != 0: + pytest.fail(reason) else: - print("Comparison bit exact") + # Fail if compare fails compare result + if metacmp_res == False and pcmcmp_res != 0: + pytest.fail("Metadata and transport output difference detected") + elif metacmp_res == False: + pytest.fail("Metadata output difference detected") + elif pcmcmp_res != 0: + pytest.fail("Transport output difference detected") + else: + print("Comparison bit exact") else: # Compare audio outputs -- GitLab