Commit f68c3daa authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch '1035-issue-with-headtracking-in-osba' into 'main' 

[split-non-be][non-BE] headtracking fix in SBA part of OSBA

See merge request !1464
parents 88495a44 9fded85a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 
#define FIX_1023_REMOVE_PARAMMC_DEC                     /* VA: issue 1023: remove unused function ivas_param_mc_dec() */

#define FIX_1022_REMOVE_PARAMISM_DEC                    /* VA: issue 1022: remove unused function ivas_param_ism_dec() */



#define FIX_1035_HT_OSBA                                /* Dlb: issue 1035: Issue with headtracking in OSBA*/

/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

lib_dec/ivas_binRenderer_internal.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

    }

scripts/config/self_test.prm

+4 −0
Original line number Diff line number Diff line
@@ -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

scripts/config/self_test_ltv.prm

+4 −0
Original line number Diff line number Diff line
@@ -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