From f651c0d9d59635c9dc38bd897ae2661558e662f3 Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 19 Oct 2022 19:58:57 +0200 Subject: [PATCH 1/3] fix clash between ISM_BITRATE_SWITCHING and FIX_155_HP20_ISSUE --- lib_enc/ivas_ism_param_enc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib_enc/ivas_ism_param_enc.c b/lib_enc/ivas_ism_param_enc.c index 66fac81674..3358e41e21 100644 --- a/lib_enc/ivas_ism_param_enc.c +++ b/lib_enc/ivas_ism_param_enc.c @@ -41,11 +41,11 @@ #include "ivas_rom_com.h" #include "wmops.h" - +#ifndef FIX_155_HP20_ISSUE #ifdef CORECODER_BITRATE_SWITCHING static ivas_error ivas_hp20_reconfig( Encoder_Struct *st_ivas, const int16_t nchan_hp20_old ); #endif - +#endif /*------------------------------------------------------------------------- * Local function definitions *------------------------------------------------------------------------*/ @@ -534,6 +534,7 @@ ivas_error ivas_ism_enc_config( st_ivas->hDirAC = NULL; } +#ifndef FIX_155_HP20_ISSUE #ifdef CORECODER_BITRATE_SWITCHING ivas_hp20_reconfig( st_ivas, nchan_transport_old ); #else @@ -574,6 +575,7 @@ ivas_error ivas_ism_enc_config( set_f( st_ivas->mem_hp20_in[sce_id], 0.0f, L_HP20_MEM ); } +#endif #endif } #else @@ -588,7 +590,7 @@ ivas_error ivas_ism_enc_config( return error; } - +#ifndef FIX_155_HP20_ISSUE #ifdef CORECODER_BITRATE_SWITCHING // VE: this is the same function as at the decoder -> harmonize them to a new file ivas_corecoder_reconfig.c /*-------------------------------------------------------------------* @@ -674,3 +676,4 @@ static ivas_error ivas_hp20_reconfig( return error; } #endif +#endif -- GitLab From 40c12d6952fa3fd82af024375fc1cc2c47da35e6 Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 19 Oct 2022 20:05:31 +0200 Subject: [PATCH 2/3] [self-test] add two ISM bitrate switching conditions --- scripts/config/self_test.prm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index 721e93a457..ebb240c865 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -280,10 +280,6 @@ ../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 13200 48 testv/stv48n.pcm bit ../IVAS_dec -fec 5 BINAURAL 48 bit testv/stv48n.pcm_13200_48-48_DTX_FEC5_BINAURAL.tst -// 1 ISm with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, MONO out -../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 32000 32 testv/stv32n.pcm bit -../IVAS_dec MONO 32 bit testv/stv32n.pcm_32000_32-32_DTX_MONO.tst - // 2 ISm with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, STEREO out ../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 16400 48 testv/stv2ISM48s.pcm bit ../IVAS_dec STEREO 48 bit testv/stv2ISM48s.pcm_16400_48-48_STEREO.tst @@ -296,6 +292,10 @@ ../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 24400 48 testv/stv3ISM48s.pcm bit ../IVAS_dec -fec 5 MONO 48 bit testv/stv3ISM48s.pcm_24400_48-48_MONO_FEC5.tst +// 1 ISm with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, MONO out +../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 32000 32 testv/stv32n.pcm bit +../IVAS_dec MONO 32 bit testv/stv32n.pcm_32000_32-32_DTX_MONO.tst + // 4 ISm with metadata at 32 kbps, 48 kHz in, 48 kHz out, FOA out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.pcm bit ../IVAS_dec FOA 48 bit testv/stv4ISM48s.pcm_32000_48-48_FOA.tst @@ -400,6 +400,14 @@ ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.pcm bit ../IVAS_dec -t testv/headrot_case03_3000_q.csv BINAURAL 48 bit testv/stv4ISM48s.pcm_256000_48-48_TDHR.tst +// 1 ISm with metadata bitrate switching from 13.2 kbps to 128 kbps, 32 kHz in, 32 kHz out, mono out, DTX on +../IVAS_cod -dtx -ism 1 testv/stvISM1.csv switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/stv32c.pcm bit +../IVAS_dec MONO 32 bit testv/stv32c.pcm_brate_sw_32-32_mono_dtx.tst + +// 4 ISm with metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out +../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48s.pcm bit +../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.pcm_brate_sw_48-48_BINAURAL.tst + // SBA at 13.2 kbps, 32kHz in, 32kHz out, HOA3 out ../IVAS_cod -sba 3 13200 32 testv/stv3OA32c.pcm bit -- GitLab From a1dfcab449d792ce24b077a210fd179cbc361a69 Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 19 Oct 2022 20:17:56 +0200 Subject: [PATCH 3/3] fix in self-test conditions --- scripts/config/self_test.prm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index ebb240c865..470b649ce0 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -401,11 +401,11 @@ ../IVAS_dec -t testv/headrot_case03_3000_q.csv BINAURAL 48 bit testv/stv4ISM48s.pcm_256000_48-48_TDHR.tst // 1 ISm with metadata bitrate switching from 13.2 kbps to 128 kbps, 32 kHz in, 32 kHz out, mono out, DTX on -../IVAS_cod -dtx -ism 1 testv/stvISM1.csv switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/stv32c.pcm bit +../IVAS_cod -dtx -ism 1 testv/stvISM1.csv ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/stv32c.pcm bit ../IVAS_dec MONO 32 bit testv/stv32c.pcm_brate_sw_32-32_mono_dtx.tst // 4 ISm with metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out -../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48s.pcm bit +../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48s.pcm bit ../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.pcm_brate_sw_48-48_BINAURAL.tst -- GitLab