Merge remote-tracking branch 'origin/main' into 682-add-ext-support-for-omasa-jbm (a3d30fb7) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+5 −2

Original line number	Diff line number	Diff line
		@@ -1476,11 +1476,14 @@ upload-selection-BE-log:
		script:
		- cp -r $SELECTION_BE_RESULT ./selection-BE-result
		- Get-Content -Path selection-BE-result/public_log--sha-*.txt
		- $has_failed = (Select-String -Path selection-BE-result/public_log--sha-*.txt -Pattern '^FAILED tests' -CaseSensitive).Line
		- If($has_failed) {exit -1}
		- $has_failed_debugging_active = (Select-String -Path selection-BE-result/public_log--sha-*.txt -Pattern '^FAILED tests' -CaseSensitive).Line
		- Get-Content -Path selection-BE-result/public_log_DEBUGGING_inactive--sha-*.txt
		- $has_failed_debugging_inactive = (Select-String -Path selection-BE-result/public_log_DEBUGGING_inactive--sha-*.txt -Pattern '^FAILED tests' -CaseSensitive).Line
		- If($has_failed_debugging_active -or $has_failed_debugging_inactive) {exit -1}
		artifacts:
		paths:
		- selection-BE-result/public_log--sha-*.txt
		- selection-BE-result/public_log_DEBUGGING_inactive--sha-*.txt
		when: always
		expire_in: 1 week

apps/decoder.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -2891,6 +2891,13 @@ cleanup:
		#ifdef SUPPORT_JBM_TRACEFILE
		JbmTraceFileWriter_close( &jbmTraceWriter );
		#endif
		#ifdef FIX_683_JBM_CLEANUP
		MasaFileWriter_close( &masaWriter );
		for ( int16_t i = 0; i < IVAS_MAX_NUM_OBJECTS; i++ )
		{
		IsmFileWriter_close( &ismWriters[i] );
		}
		#endif

		if ( decodingFailed && error == IVAS_ERR_OK )
		{

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -240,6 +240,7 @@
		#define FIX_657_REMOVE_EDITING /* Nokia: Remove remaining unused coded related to object editing */
		#define FIX_634_MASA_JBM_UNUSED_PARAMETER /* Nokia: Fix issue 634 by removing the unnecessary argument. */
		#define FIX_675_WB_OMASA /* Nokia: Fix for issue 675 solving the crash in OMASA for WB input */
		#define FIX_683_JBM_CLEANUP /* FhG: Fix for issue 683, add clean up for ISM and MASA file writers */

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

scripts/config/self_test.prm

+28 −28

Original line number	Diff line number	Diff line
		@@ -1383,57 +1383,57 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit


		// OSBA FOA 1ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out
		//../IVAS_cod -ism_sba 1 1 testv/stvISM1.csv 32000 48 testv/stvOSBA_1ISM_FOA48c.wav bit
		//../IVAS_dec BINAURAL 48 bit testv/stvOSBA_1ISM_FOA48c.wav_BINAURAL_32000_48-48.tst
		../IVAS_cod -ism_sba 1 1 testv/stvISM1.csv 32000 48 testv/stvOSBA_1ISM_FOA48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOSBA_1ISM_FOA48c.wav_BINAURAL_32000_48-48.tst

		// OSBA FOA 2ISM at 64 kbps, 48kHz in, 48kHz out, HOA3 out
		//../IVAS_cod -ism_sba 2 1 testv/stvISM1.csv testv/stvISM2.csv 64000 48 testv/stvOSBA_2ISM_FOA48c.wav bit
		//../IVAS_dec HOA3 48 bit testv/stvOSBA_2ISM_FOA48c.wav_HOA3_64000_48-48.tst
		../IVAS_cod -ism_sba 2 1 testv/stvISM1.csv testv/stvISM2.csv 64000 48 testv/stvOSBA_2ISM_FOA48c.wav bit
		../IVAS_dec HOA3 48 bit testv/stvOSBA_2ISM_FOA48c.wav_HOA3_64000_48-48.tst

		// OSBA FOA 3ISM at 128 kbps, 48kHz in, 48kHz out, 7_1_4 out
		//../IVAS_cod -ism_sba 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stvOSBA_3ISM_FOA48c.wav bit
		//../IVAS_dec 7_1_4 48 bit testv/stvOSBA_3ISM_FOA48c.wav_7_1_4_128000_48-48.tst
		../IVAS_cod -ism_sba 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stvOSBA_3ISM_FOA48c.wav bit
		../IVAS_dec 7_1_4 48 bit testv/stvOSBA_3ISM_FOA48c.wav_7_1_4_128000_48-48.tst

		// OSBA FOA 4ISM at 256 kbps, 48kHz in, 48kHz out, EXT out
		//../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stvOSBA_4ISM_FOA48c.wav bit
		//../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_FOA48c.wav_EXT_256000_48-48.tst
		../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stvOSBA_4ISM_FOA48c.wav bit
		../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_FOA48c.wav_EXT_256000_48-48.tst

		// OSBA FOA 4ISM at 512 kbps, 48kHz in, 48kHz out, BINAURAL out
		//../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stvOSBA_4ISM_FOA48c.wav bit
		//../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_FOA48c.wav_BINAURAL_512000_48-48.tst
		../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stvOSBA_4ISM_FOA48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_FOA48c.wav_BINAURAL_512000_48-48.tst

		// OSBA 2OA 1ISM at 24.4 kbps, 48kHz in, 48kHz out, FOA out
		//../IVAS_cod -ism_sba 1 2 testv/stvISM1.csv 24400 48 testv/stvOSBA_1ISM_2OA48c.wav bit
		//../IVAS_dec FOA 48 bit testv/stvOSBA_1ISM_2OA48c.wav_FOA_24400_48-48.tst
		../IVAS_cod -ism_sba 1 2 testv/stvISM1.csv 24400 48 testv/stvOSBA_1ISM_2OA48c.wav bit
		../IVAS_dec FOA 48 bit testv/stvOSBA_1ISM_2OA48c.wav_FOA_24400_48-48.tst

		// OSBA 2OA 2ISM at 48 kbps, 48kHz in, 48kHz out, MONO out
		//../IVAS_cod -ism_sba 2 2 testv/stvISM1.csv testv/stvISM2.csv 48000 48 testv/stvOSBA_2ISM_2OA48c.wav bit
		//../IVAS_dec MONO 48 bit testv/stvOSBA_2ISM_2OA48c.wav_MONO_48000_48-48.tst
		../IVAS_cod -ism_sba 2 2 testv/stvISM1.csv testv/stvISM2.csv 48000 48 testv/stvOSBA_2ISM_2OA48c.wav bit
		../IVAS_dec MONO 48 bit testv/stvOSBA_2ISM_2OA48c.wav_MONO_48000_48-48.tst

		// OSBA 2OA 3ISM at 96 kbps, 48kHz in, 48kHz out, STEREO out
		//../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 96000 48 testv/stvOSBA_3ISM_2OA48c.wav bit
		//../IVAS_dec STEREO 48 bit testv/stvOSBA_3ISM_2OA48c.wav_STEREO_96000_48-48.tst
		../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 96000 48 testv/stvOSBA_3ISM_2OA48c.wav bit
		../IVAS_dec STEREO 48 bit testv/stvOSBA_3ISM_2OA48c.wav_STEREO_96000_48-48.tst

		// OSBA 2OA 4ISM at 384 kbps, 48kHz in, 48kHz out, BINAURAL out
		//../IVAS_cod -ism_sba 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 384000 48 testv/stvOSBA_4ISM_2OA48c.wav bit
		//../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_2OA48c.wav_BINAURAL_384000_48-48.tst
		../IVAS_cod -ism_sba 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 384000 48 testv/stvOSBA_4ISM_2OA48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_2OA48c.wav_BINAURAL_384000_48-48.tst

		// OSBA 3OA 1ISM at 512 kbps, 48kHz in, 48kHz out, EXT out
		//../IVAS_cod -ism_sba 1 3 testv/stvISM1.csv 512000 48 testv/stvOSBA_1ISM_3OA48c.wav bit
		//../IVAS_dec EXT 48 bit testv/stvOSBA_1ISM_3OA48c.wav_EXT_512000_48-48.tst
		../IVAS_cod -ism_sba 1 3 testv/stvISM1.csv 512000 48 testv/stvOSBA_1ISM_3OA48c.wav bit
		../IVAS_dec EXT 48 bit testv/stvOSBA_1ISM_3OA48c.wav_EXT_512000_48-48.tst

		// OSBA 3OA 2ISM at 256 kbps, 48kHz in, 48kHz out, 7_1 out
		//../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 48 testv/stvOSBA_2ISM_3OA48c.wav bit
		//../IVAS_dec 7_1 48 bit testv/stvOSBA_2ISM_3OA48c.wav_7_1_256000_48-48.tst
		../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 48 testv/stvOSBA_2ISM_3OA48c.wav bit
		../IVAS_dec 7_1 48 bit testv/stvOSBA_2ISM_3OA48c.wav_7_1_256000_48-48.tst

		// OSBA 3OA 3ISM at 128 kbps, 48kHz in, 48kHz out, BINAURAL out
		//../IVAS_cod -ism_sba 3 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stvOSBA_3ISM_3OA48c.wav bit
		//../IVAS_dec BINAURAL 48 bit testv/stvOSBA_3ISM_3OA48c.wav_BINAURAL_128000_48-48.tst
		../IVAS_cod -ism_sba 3 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stvOSBA_3ISM_3OA48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOSBA_3ISM_3OA48c.wav_BINAURAL_128000_48-48.tst

		// OSBA 3OA 4ISM at 16.4 kbps, 48kHz in, 48kHz out, 5_1 out
		//../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 16400 48 testv/stvOSBA_4ISM_3OA48c.wav bit
		//../IVAS_dec 5_1 48 bit testv/stvOSBA_4ISM_3OA48c.wav_5_1_16400_48-48.tst
		../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 16400 48 testv/stvOSBA_4ISM_3OA48c.wav bit
		../IVAS_dec 5_1 48 bit testv/stvOSBA_4ISM_3OA48c.wav_5_1_16400_48-48.tst

		// OSBA 3OA 4ISM bitrate switching 13.2 to 512, 48kHz in, 48kHz out, BIN out
		//../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 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
		../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

tests/split_rendering/constants.py

+10 −7

Original line number	Diff line number	Diff line
		@@ -53,10 +53,6 @@ from tests.renderer.constants import (
		FORMAT_TO_FILE_COMPARETEST,
		FORMAT_TO_FILE_SMOKETEST,
		FORMAT_TO_METADATA_FILES,
		INPUT_FORMATS_AMBI,
		INPUT_FORMATS_ISM,
		INPUT_FORMATS_MASA,
		INPUT_FORMATS_MC,
		METADATA_SCENES_TO_TEST,
		)

		@@ -132,6 +128,11 @@ FORMAT_TO_NCHAN = {
		"MASA2": 2,
		}

		INPUT_FORMATS_AMBI_SPLIT_REND = ["FOA", "HOA3"]
		INPUT_FORMATS_MC_SPLIT_REND = ["5_1", "7_1_4"]
		INPUT_FORMATS_ISM_SPLIT_REND = ["ISM4"]
		INPUT_FORMATS_MASA_SPLIT_REND = ["MASA2"]

		IVAS_BITRATES_AMBI = ["80000", "512000"]
		IVAS_BITRATES_MC = ["128000", "160000", "384000"]
		IVAS_BITRATES_ISM = ["128000"]
		@@ -144,6 +145,8 @@ IVAS_MAX_ISM_BITRATE = {
		"4": "512000",
		}

		RENDERER_FORMATS = ["BINAURAL_SPLIT_CODED", "BINAURAL_SPLIT_PCM"]

		INPUT_DURATION_SEC = 5

		""" PLC constants """
		@@ -165,7 +168,7 @@ SPLIT_PRE_DEC_CMD = [
		"", # 2 -> pre-trajectory file
		"-render_config",
		"", # 4 -> render config file
		"BINAURAL_SPLIT_CODED",
		"", # 5 -> renderer format
		"48",
		"", # 7 -> encoder bitstream
		"", # 8 -> split rendering bitstream
		@@ -185,7 +188,7 @@ SPLIT_PRE_REND_CMD = [
		"-o",
		"", # 10 -> split rendering bitstream
		"-of",
		"BINAURAL_SPLIT_CODED",
		"", # 12 -> renderer format
		"-tf",
		"", # 14 -> post-trajectory file
		]
		@@ -198,7 +201,7 @@ SPLIT_POST_REND_CMD = [
		"-i",
		"", # 4 -> split rendering bitstream
		"-if",
		"BINAURAL_SPLIT_CODED",
		"", # 6 -> renderer format
		"-o",
		"", # 8 -> output file
		"-of",