From 2dcaa4c81b518d14ab266a73a384186a495c3689 Mon Sep 17 00:00:00 2001 From: rtyag Date: Tue, 19 Mar 2024 13:12:18 +1100 Subject: [PATCH 1/2] headtracking fix in SBA part of OSBA --- lib_com/options.h | 1 + lib_dec/ivas_binRenderer_internal.c | 4 ++++ scripts/config/self_test.prm | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 52357d6c25..2d65b5b937 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -158,6 +158,7 @@ #define FIX_1027_GSC_INT_OVERFLOW /* VA: issue 2207: overflow in GSC */ +#define FIX_1035_HT_OSBA /* Dlb: issue 1035: Issue with headtracking in OSBA*/ /* #################### End BE switches ################################## */ /* #################### Start NON-BE switches ############################ */ diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index 75a8247cc1..a624e81eee 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -1122,7 +1122,11 @@ ivas_error ivas_binRenderer_open( /* Define of head rotation has to be done in binRendeder in CLDFB*/ hBinRenderer->rotInCldfb = 0; +#ifdef FIX_1035_HT_OSBA + if ( st_ivas->ivas_format == MC_FORMAT || st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT ) +#else if ( st_ivas->ivas_format == MC_FORMAT || st_ivas->ivas_format == SBA_FORMAT ) +#endif { hBinRenderer->rotInCldfb = 1; } diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index a9bb024f30..6a5243e44c 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -1670,6 +1670,10 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_4ISM_3OA48c.wav bit ../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_3OA48c.wav_BINAURAL_sw_13k2_512k_48-48.tst +// OSBA 3OA 4ISM bitrate switching 16.4 to 512, 48kHz in, 48kHz out, BINAURAL out, headtracking +../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_16k4_512k_50fr.bin 48 testv/stvOSBA_4ISM_3OA48c.wav bit +../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/stvOSBA_4ISM_3OA48c.wav_BINAURAL_sw_16k4_512k_48-48.tst + // OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, HOA3 out ../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 32 testv/stvOSBA_2ISM_3OA32c.wav bit ../IVAS_dec HOA3 32 bit testv/stvOSBA_2ISM_3OA32c.wav_HOA3_256000_32-32.tst -- GitLab From 568ae2397ca0d83ba54fdf6b1c1bf8ae94521f05 Mon Sep 17 00:00:00 2001 From: rtyag Date: Tue, 19 Mar 2024 18:10:29 +1100 Subject: [PATCH 2/2] add OSBA headtracking test case in LTV config prm --- scripts/config/self_test_ltv.prm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/config/self_test_ltv.prm b/scripts/config/self_test_ltv.prm index 5080418476..8bd327fd8b 100644 --- a/scripts/config/self_test_ltv.prm +++ b/scripts/config/self_test_ltv.prm @@ -1670,6 +1670,10 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -ism_sba 4 3 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_OSBA_4ISM_HOA3.wav bit ../IVAS_dec BINAURAL 48 bit testv/ltv48_OSBA_4ISM_HOA3.wav_BINAURAL_sw_13k2_512k_48-48.tst +// OSBA 3OA 4ISM bitrate switching 16.4 to 512, 48kHz in, 48kHz out, BINAURAL out, headtracking +../IVAS_cod -ism_sba 4 3 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv ../scripts/switchPaths/sw_16k4_512k_50fr.bin 48 testv/ltv48_OSBA_4ISM_HOA3.wav bit +../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/ltvOSBA_4ISM_3OA48c.wav_BINAURAL_sw_16k4_512k_48-48.tst + // OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, HOA3 out ../IVAS_cod -ism_sba 2 3 testv/ltvISM1.csv testv/ltvISM2.csv 256000 32 testv/ltv32_OSBA_2ISM_HOA3.wav bit ../IVAS_dec HOA3 32 bit testv/ltv32_OSBA_2ISM_HOA3.wav_HOA3_256000_32-32.tst -- GitLab