Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 167-efap-polygon-selection-bug (9c1e0fd3) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_enc/ivas_ism_param_enc.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -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

scripts/config/self_test.prm

+12 −4

Original line number	Diff line number	Diff line
		@@ -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 ../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 ../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


		// SBA at 13.2 kbps, 32kHz in, 32kHz out, HOA3 out
		../IVAS_cod -sba 3 13200 32 testv/stv3OA32c.pcm bit