Commit f69e98e1 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into 1063-usan-division-by-zero-in-ivas_stereo_dft_enc_itd-c-for-omasa-encoding
parents 422cc7d9 288a390e

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ 
#define FIX_1033_MEMORY_LEAK_OMASA                      /* Nokia / Orange: issue #1033: Memory leak in OMASA to BINAURAL with HRTF with bitrate switching */

#define FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI      /* FhG: move setting of pointers for parameter decoding so they are skipped in lost frames when they are not needed */

#define FIX_1043_JBM_MD_BUFFER                          /* VA: issue 1043: JBM MD handle allocation is avoided in non-JBM EXT operations */

#define FIX_1044_ISM_REND_MEMORY                        /* VA: issue 1044: Lower the memory of the ISM renderer handle. */

                                                        

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

lib_dec/ivas_stat_dec.h

+8 −0
Original line number Diff line number Diff line
@@ -804,10 +804,18 @@ typedef struct ivas_lfe_dec_data_structure 


typedef struct renderer_struct

{

#ifdef FIX_1044_ISM_REND_MEMORY

    float prev_gains[MAX_NUM_OBJECTS][MAX_OUTPUT_CHANNELS];

#else

    float prev_gains[MAX_CICP_CHANNELS - 1][MAX_OUTPUT_CHANNELS];

#endif

    float *interpolator;

    int16_t interpolator_length;

#ifdef FIX_1044_ISM_REND_MEMORY

    float gains[MAX_NUM_OBJECTS][MAX_OUTPUT_CHANNELS];

#else

    float gains[MAX_CICP_CHANNELS - 1][MAX_OUTPUT_CHANNELS];

#endif



} ISM_RENDERER_DATA, *ISM_RENDERER_HANDLE;

scripts/config/self_test.prm

+13 −1
Original line number Diff line number Diff line
@@ -149,10 +149,18 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec STEREO 48 bit_error testv/stvST32n.wav_stereo_24400_32-48_DTX_FER5.tst



// stereo at 24.4 kbps, 48kHz in, 48kHz out, DTX on

../IVAS_cod -stereo -dtx 24400 48 testv/stvST48n.wav bit

../IVAS_dec STEREO 48 bit testv/stvST48n.wav_24400_48_48_DTX.txt



// stereo at 32 kbps, 32kHz in, 32kHz out

../IVAS_cod -stereo 32000 32 testv/stvST32c.wav bit

../IVAS_dec STEREO 32 bit testv/stvST32c.wav_stereo_32000_32-32.tst



// stereo at 32 kbps, 32kHz in, 32kHz out, NOOP

../IVAS_cod -stereo 32000 32 testv/stvST32noop.wav bit

../IVAS_dec STEREO 32 bit testv/stvST32noop.wav_stereo_32000_32-32.tst



// stereo at 32 kbps, 32kHz in, 32kHz out, random FER at 5%

../IVAS_cod -stereo 32000 32 testv/stvST32c.wav bit

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
@@ -242,6 +250,10 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_cod -stereo 48000 32 testv/stvST32c.wav bit

../IVAS_dec MONO 32 bit testv/stvST32c.wav_stereo_48000_32-32_MONO.tst



// stereo at 13.2 kbps, 48kHz in, 48kHz out 

../IVAS_cod -stereo 13200 48 testv/stvST48c.wav bit

../IVAS_dec STEREO 48 bit testv/stvST48c.wav_stereo_13200_48-48.tst



// stereo at 128 kbps, 48kHz in, 48kHz out, MONO out

../IVAS_cod -stereo 128000 48 testv/stvST48c.wav bit

../IVAS_dec MONO 48 bit testv/stvST48c.wav_stereo_128000_48-48_MONO.tst
@@ -1600,7 +1612,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit

../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_ROOM_REVERB_sw_48-48.tst



// OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL out (Model from file)

// OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 16kHz out, BINAURAL out (Model from file)

../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit

../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_sw_48-16.tst

scripts/config/self_test_ltv.prm

+15 −6
Original line number Diff line number Diff line
@@ -148,10 +148,16 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_cod -stereo -dtx 24400 32 testv/ltv32_STEREO.wav bit

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec STEREO 48 bit_error testv/ltv32_STEREO.wav_stereo_24400_32-48_DTX_FER5.tst

// stereo at 24.4 kbps, 48kHz in, 48kHz out, DTX on

../IVAS_cod -stereo -dtx 24400 48 testv/ltv32_STEREO.wav bit

../IVAS_dec STEREO 48 bit testv/ltv32_STEREO.wav_24400_48_48_DTX.txt



// stereo at 32 kbps, 32kHz in, 32kHz out

../IVAS_cod -stereo 32000 32 testv/ltv32_STEREO.wav bit

../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_32000_32-32.tst

// stereo at 32 kbps, 32kHz in, 32kHz out, NOOP

../IVAS_cod -stereo 32000 32 testv/stvST32noop.wav bit

../IVAS_dec STEREO 32 bit testv/stvST32noop.wav_stereo_32000_32-32.tst



// stereo at 32 kbps, 32kHz in, 32kHz out, random FER at 5%

../IVAS_cod -stereo 32000 32 testv/ltv32_STEREO.wav bit
@@ -241,6 +247,9 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
// stereo at 48 kbps, 32kHz in, 32kHz out, MONO out

../IVAS_cod -stereo 48000 32 testv/ltv32_STEREO.wav bit

../IVAS_dec MONO 32 bit testv/ltv32_STEREO.wav_stereo_48000_32-32_MONO.tst

// stereo at 13.2 kbps, 48kHz in, 48kHz out 

../IVAS_cod -stereo 13200 48 testv/ltv32_STEREO.wav bit

../IVAS_dec STEREO 48 bit testv/ltv32_STEREO.wav_stereo_13200_48-48.tst



// stereo at 128 kbps, 48kHz in, 48kHz out, MONO out

../IVAS_cod -stereo 128000 48 testv/ltv48_STEREO.wav bit
@@ -543,7 +552,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_cod -dtx -ism +4 testv/ltvISM1.csv NULL testv/ltvISM3.csv testv/ltvISM4.csv 256000 48 testv/ltv48_4ISM.wav bit

../IVAS_dec BINAURAL 48 bit testv/ltv48_4ISM_non_diegetic_pan.wav_brate_256000-48_DTX_binaural.tst



// 4 ISM with extended metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out, combined render config, directivity configuration with identifiers

// 4 ISM with extended metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out, rendconf dir w id

../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 128000 48 testv/ltv48_4ISM.wav bit

../IVAS_dec -render_config testv/rend_config_combined.cfg -dpid 0 0 0 0 BINAURAL_ROOM_REVERB 48 bit testv/ltv48_4ISM+combined_render_config_brate_128000-48-binaural_room_reverb.wav
@@ -882,7 +891,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_cod -sba -1 128000 48 testv/ltv48_FOA.wav bit

../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin -t testv/headrot_case00_3000_q.csv -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 32 bit testv/ltv48_FOA.pcm_planarSBA_12800032-32_BinauralRoomReverb_Config_renderer_Headrot_BinauralFile.tst



// SBA 3OA at 128 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB combined renderer configuration with selected acoustic environment

// SBA 3OA at 128 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB rendconf sel acoustic env

../IVAS_cod -sba 3 128000 48 testv/ltv48_HOA3.wav bit

../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 1 BINAURAL_ROOM_REVERB 48 bit testv/ltv48_HOA3.pcm_SBA_12800048-48_BinauralRoomReverb_Config_renderer_combined_AEID_1.tst
@@ -1235,14 +1244,14 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -mc 7_1_4 160000 48 testv/ltv48_MC714.wav bit

../IVAS_dec BINAURAL 48 bit testv/ltv48_MC714.wav_MC714_160000_48-48_MC_binaural.tst



// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, HR

../IVAS_cod -mc 7_1_4 512000 48 testv/ltv48_MC714.wav bit

../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/ltv48_MC714.wav_MC714_512000_48-48_MC_binaural_hrot.tst



// Multi-channel 7_1_4 at 160 kbps, 48kHz in, 48kHz out, 7_1_4 out

../IVAS_cod -mc 7_1_4 160000 48 testv/ltv48_MC714.wav bit

../IVAS_dec 7_1_4 48 bit testv/ltv48_MC714.wav_MC714_160000_48-48_MC714.tst



// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, HR

../IVAS_cod -mc 7_1_4 512000 48 testv/ltv48_MC714.wav bit

../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/ltv48_MC714.wav_MC714_512000_48-48_MC_binaural_hrot.tst



// Multi-channel 5_1_2 at 32 kbps, 48kHz in, 48kHz out, STEREO out, random FER at 5%

../IVAS_cod -mc 5_1_2 32000 48 testv/ltv48_MC512.wav bit

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

scripts/testv/stvST16c.wav

LFS
(132 B)

File changed.

No diff preview for this file type.

View original file
View changed file