Merge branch 'main' into 661-basop32-ch-api-for-div_s-and-div_l-different-from-itu-stl (26d848d8) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitignore

+4 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,10 @@ tests/**/[c\|d]ut
		tests/**/ref
		tests/*/testv
		scripts/testv/_cut.pcm
		scripts/testv/stvOMASA_*.met
		scripts/testv/stvOMASA_*.csv
		scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav
		scripts/testv/stvOMASA_3ISM_1MASA1TC48c.wav
		# default reference binary name
		IVAS_cod_ref
		IVAS_dec_ref

.gitlab-ci.yml

+20 −8

Original line number	Diff line number	Diff line
		@@ -517,7 +517,9 @@ renderer-pytest-on-merge-request:
		- *print-common-info

		# some helper variables - "\|\| true" to prevent failures from grep not finding anything
		- non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[rend$erer$[ -]non[ -]*be\]") \|\| true
		# write to temporary file as workaround for failures observed with piping echo
		- echo $CI_MERGE_REQUEST_TITLE > tmp.txt
		- non_be_flag=$(grep -c --ignore-case "\[rend$erer$[ -]non[ -]*be\]" tmp.txt) \|\| true
		# TODO: needs splitting the test between reference and cut generation
		#- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[ref[ -]using[ -]main\]") \|\| true

		@@ -593,7 +595,9 @@ split-rendering-pytest-on-merge-request:
		- *print-common-info

		# some helper variables - "\|\| true" to prevent failures from grep not finding anything
		- non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[split[ -]non[ -]*be\]") \|\| true
		# write to temporary file as workaround for failures observed with piping echo
		- echo $CI_MERGE_REQUEST_TITLE > tmp.txt
		- non_be_flag=$(grep -c --ignore-case "\[split[ -]non[ -]*be\]" tmp.txt) \|\| true
		# TODO: needs splitting the test between reference and cut generation
		#- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[ref[ -]using[ -]main\]") \|\| true

		@@ -650,8 +654,10 @@ ivas-pytest-on-merge-request:
		- *merge-request-comparison-setup-codec

		# some helper variables - "\|\| true" to prevent failures from grep not finding anything
		- non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[non[ -]*be\]") \|\| true
		- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[ref[ -]using[ -]main\]") \|\| true
		# write to temporary file as workaround for failures observed with piping echo
		- echo $CI_MERGE_REQUEST_TITLE > tmp.txt
		- non_be_flag=$(grep -c --ignore-case "\[non[ -]*be\]" tmp.txt) \|\| true
		- ref_using_main=$(grep -c --ignore-case "\[ref[ -]using[ -]main\]" tmp.txt) \|\| true

		### If ref_using_main is not set, checkoug the source branch to use scripts and input from there
		- if [ $ref_using_main == 0 ]; then git checkout $source_branch_commit_sha; fi
		@@ -700,8 +706,10 @@ evs-pytest-on-merge-request:
		- *merge-request-comparison-setup-codec

		# some helper variables - "\|\| true" to prevent failures from grep not finding anything
		- non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[evs[ -]non[ -]be\]") \|\| true
		- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[ref[ -]using[ -]main\]") \|\| true
		# write to temporary file as workaround for failures observed with piping echo
		- echo $CI_MERGE_REQUEST_TITLE > tmp.txt
		- non_be_flag=$(grep -c --ignore-case "\[evs[ -]non[ -]be\]" tmp.txt) \|\| true
		- ref_using_main=$(grep -c --ignore-case "\[ref[ -]using[ -]main\]" tmp.txt) \|\| true

		### If ref_using_main is not set, checkoug the source branch to use scripts and input from there
		- if [ $ref_using_main == 0 ]; then git checkout $source_branch_commit_sha; fi
		@@ -803,6 +811,8 @@ check-first-frame-is-sid:
		script:
		- *print-common-info
		- *update-ltv-repo
		# Temporary fix to test only SID start config files in this job
		- rm scripts/config/ci_linux_ltv.json scripts/config/ci_linux.json
		- *check-for-testvectors
		- cmake .
		- make -j
		@@ -972,8 +982,10 @@ codec-comparison-on-main-push:
		- cd ..

		# helper variable - "\|\| true" to prevent failures from grep not finding anything
		- non_be_flag=$(echo $CI_COMMIT_MESSAGE \| grep -c --ignore-case "\[non[ -]*be\]") \|\| true
		- ref_using_main=$(echo $CI_COMMIT_MESSAGE \| grep -c --ignore-case "\[ref[ -]using[ -]main\]") \|\| true
		# write to temporary file as workaround for failures observed with piping echo
		- echo $CI_COMMIT_MESSAGE > tmp.txt
		- non_be_flag=$(grep -c --ignore-case "\[non[ -]*be\]" tmp.txt) \|\| true
		- ref_using_main=$(grep -c --ignore-case "\[ref[ -]using[ -]main\]" tmp.txt) \|\| true

		### re-checkout the latest commit in the main branch, if ref_using_main is not set
		- if [ $ref_using_main == 0 ]; then git checkout $latest_commit;fi

apps/decoder.c

+73 −3

Original line number	Diff line number	Diff line
		@@ -157,6 +157,13 @@ typedef struct
		#endif
		#endif

		#ifdef CONTROL_METADATA_REVERB
		uint16_t acousticEnvironmentId;
		#ifdef CONTROL_METADATA_DIRECTIVITY
		uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];
		#endif
		#endif

		} DecArguments;


		@@ -602,12 +609,42 @@ int main(
		goto cleanup;
		}

		#ifdef CONTROL_METADATA_REVERB
		if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )
		#else
		if ( RenderConfigReader_read( renderConfigReader, &renderConfig ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );
		goto cleanup;
		}
		#ifdef CONTROL_METADATA_DIRECTIVITY
		if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, arg.directivityPatternId, renderConfig.directivity ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to get directivity for objects: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );
		goto cleanup;
		}
		#endif

		#ifdef CONTROL_METADATA_REVERB
		if ( arg.outputFormat == IVAS_DEC_OUTPUT_BINAURAL_ROOM_REVERB )
		{
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.acousticEnvironmentId, &renderConfig.room_acoustics ) ) == IVAS_ERR_OK )
		{
		if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Invalid reverberation configuration parameters\n\n" );
		goto cleanup;
		}
		}
		else if ( error != IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING )
		{
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", arg.acousticEnvironmentId );
		goto cleanup;
		}
		renderConfig.room_acoustics.override = true;
		}
		#endif
		if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, renderConfig ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_FeedRenderConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -965,7 +1002,15 @@ static bool parseCmdlIVAS_dec(
		#endif
		#endif


		#ifdef CONTROL_METADATA_REVERB
		arg->acousticEnvironmentId = 0;
		#ifdef CONTROL_METADATA_DIRECTIVITY
		for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )
		{
		arg->directivityPatternId[i] = 0;
		}
		#endif
		#endif
		/-----------------------------------------------------------------
		* Initialization
		-----------------------------------------------------------------/
		@@ -1326,8 +1371,27 @@ static bool parseCmdlIVAS_dec(
		fprintf( stdout, "Complexity levels 1 and 2 will be defined after characterisation - default to level 3 (full functionality).\n" );
		}
		}


		#ifdef CONTROL_METADATA_REVERB
		else if ( strcmp( argv_to_upper, "-AEID" ) == 0 )
		{
		++i;
		arg->acousticEnvironmentId = (int16_t) atoi( argv[i++] );
		}
		#ifdef CONTROL_METADATA_DIRECTIVITY
		else if ( strcmp( argv_to_upper, "-DPID" ) == 0 )
		{
		++i;
		int16_t tmp;
		tmp = 0;
		while ( is_number( argv[i + tmp] ) && tmp < IVAS_MAX_NUM_OBJECTS )
		{
		arg->directivityPatternId[tmp] = (int16_t) atoi( argv[i + tmp] );
		++tmp;
		}
		i += tmp;
		}
		#endif
		#endif
		/-----------------------------------------------------------------
		* Option not recognized
		-----------------------------------------------------------------/
		@@ -1512,6 +1576,12 @@ static void usage_dec( void )
		fprintf( stdout, " Currently, all values default to level 3 (full functionality).\n" );
		#endif
		fprintf( stdout, "-exof File : External orientation file for external orientation trajectory\n" );
		#ifdef CONTROL_METADATA_DIRECTIVITY
		fprintf( stdout, "-dpid ID : Directivity pattern ID(s) (space-separated list of up to 4 numbers can be specified) for binaural output configuration\n" );
		#endif
		#ifdef CONTROL_METADATA_REVERB
		fprintf( stdout, "-aeid ID : Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output configuration\n" );
		#endif
		#ifdef DEBUG_MODE_INFO
		#ifdef DEBUG_MODE_INFO_TWEAK
		fprintf( stdout, "-info <folder> : specify subfolder name for debug output\n" );

apps/renderer.c

+75 −0

Original line number	Diff line number	Diff line
		@@ -178,6 +178,12 @@ typedef struct
		#ifdef FIX_488_SYNC_DELAY
		float syncMdDelay;
		#endif
		#ifdef CONTROL_METADATA_DIRECTIVITY
		uint16_t directivityPatternId[RENDERER_MAX_ISM_INPUTS];
		#endif
		#ifdef CONTROL_METADATA_REVERB
		uint16_t acousticEnvironmentId;
		#endif
		} CmdlnArgs;

		typedef enum
		@@ -209,6 +215,12 @@ typedef enum
		#ifdef FIX_488_SYNC_DELAY
		CmdLnOptionId_syncMdDelay,
		#endif
		#ifdef CONTROL_METADATA_DIRECTIVITY
		CmdLnOptionId_directivityPatternId,
		#endif
		#ifdef CONTROL_METADATA_REVERB
		CmdLnOptionId_acousticEnvironmentId
		#endif
		} CmdLnOptionId;

		static const CmdLnParser_Option cliOptions[] = {
		@@ -356,6 +368,22 @@ static const CmdLnParser_Option cliOptions[] = {
		.description = "Metadata Synchronization Delay in ms, Default is 0. Quantized by 5ms subframes for TDRenderer (13ms -> 10ms -> 2subframes)",
		},
		#endif
		#ifdef CONTROL_METADATA_DIRECTIVITY
		{
		.id = CmdLnOptionId_directivityPatternId,
		.match = "ism_directivity_pattern_id",
		.matchShort = "dpid",
		.description = "Directivity pattern ID(s) (space-separated list of up to 4 numbers can be specified) for binaural output configuration",
		},
		#endif
		#ifdef CONTROL_METADATA_REVERB
		{
		.id = CmdLnOptionId_acousticEnvironmentId,
		.match = "acoustic_environment_id",
		.matchShort = "aeid",
		.description = "Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output configuration",
		},
		#endif
		};


		@@ -1069,7 +1097,11 @@ int main(
		exit( -1 );
		}

		#ifdef CONTROL_METADATA_REVERB
		if ( RenderConfigReader_read( renderConfigReader, args.renderConfigFilePath, &renderConfig ) != IVAS_ERR_OK )
		#else
		if ( RenderConfigReader_read( renderConfigReader, &renderConfig ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "Failed to read renderer configuration from file %s\n", args.renderConfigFilePath );
		exit( -1 );
		@@ -1077,6 +1109,21 @@ int main(

		if ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		#ifdef CONTROL_METADATA_REVERB
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, args.acousticEnvironmentId, &renderConfig.room_acoustics ) ) == IVAS_ERR_OK )
		{
		if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Invalid room acoustics configuration parameters\n\n" );
		exit( -1 );
		}
		}
		else
		{
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", args.acousticEnvironmentId );
		exit( -1 );
		}
		#endif
		renderConfig.room_acoustics.override = TRUE;
		}

		@@ -2513,6 +2560,17 @@ static CmdlnArgs defaultArgs(
		#ifdef FIX_488_SYNC_DELAY
		args.syncMdDelay = 0;
		#endif

		#ifdef CONTROL_METADATA_DIRECTIVITY
		for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
		{
		args.directivityPatternId[i] = 0;
		}
		#endif

		#ifdef CONTROL_METADATA_REVERB
		args.acousticEnvironmentId = 0;
		#endif
		return args;
		}

		@@ -2652,6 +2710,23 @@ static void parseOption(
		exit( -1 );
		}
		break;

		#ifdef CONTROL_METADATA_DIRECTIVITY
		case CmdLnOptionId_directivityPatternId:
		assert( numOptionValues <= RENDERER_MAX_ISM_INPUTS );
		for ( int16_t i = 0; i < numOptionValues; ++i )
		{
		args->directivityPatternId[i] = (int16_t) strtol( optionValues[i], NULL, 10 );
		}
		break;
		#endif

		#ifdef CONTROL_METADATA_REVERB
		case CmdLnOptionId_acousticEnvironmentId:
		assert( numOptionValues == 1 );
		args->acousticEnvironmentId = (int16_t) strtol( optionValues[0], NULL, 10 );
		break;
		#endif
		#ifdef FIX_488_SYNC_DELAY
		case CmdLnOptionId_syncMdDelay:
		assert( numOptionValues == 1 );

ci/smoke_test.sh

+9 −4

Original line number	Diff line number	Diff line
		@@ -75,10 +75,14 @@ if [ $BUILD -eq 1 ];then

		fi

		# prepare combined format test signals
		echo "\n======================= 0. preparing combined format test inputs =======================\n\n"
		./scripts/prepare_combined_format_inputs.py

		# run all modes vanilla-fashion
		# treat ISM modes separately because passing the metadata files to MASA modes causes crashes
		ism_modes=$(./scripts/runIvasCodec.py -l \| grep ISM)
		non_ism_modes=$(./scripts/runIvasCodec.py -l \| grep -v ISM)
		ism_modes=$(./scripts/runIvasCodec.py -l \| grep ^ISM)
		non_ism_modes=$(./scripts/runIvasCodec.py -l \| grep -v ^ISM)
		echo "\n======================= 1. non-ism modes no FEC =======================\n\n"
		./scripts/runIvasCodec.py -m $non_ism_modes -p $cfg $duration_arg $WORKERS \| tee smoke_test_output.txt
		echo "\n======================= 2. ism modes no FEC =======================\n\n"
		@@ -88,8 +92,9 @@ echo "\n======================= 3. all modes with FEC =======================\n\
		./scripts/runIvasCodec.py -p $cfg $duration_arg $WORKERS -D="-fec 15" --decoder_only \| tee smoke_test_output_plc.txt

		# run JBM modes - EXT is excluded as not supported yet
		modes_with_no_ext_out=$(./scripts/runIvasCodec.py -l \| grep -v MASA \| grep -v ISM)
		modes_with_ext_out=$(./scripts/runIvasCodec.py -l \| grep 'MASA\\|ISM' \| grep -v ISM+)
		# OMASA disabled for now
		modes_with_no_ext_out=$(./scripts/runIvasCodec.py -l \| grep -v ^MASA \| grep -v ^ISM \| grep -v OMASA)
		modes_with_ext_out=$(./scripts/runIvasCodec.py -l \| grep 'MASA\\|ISM' \| grep -v ^ISM+ \| grep -v OMASA)
		echo "\n======================= 4. JBM, modes with no EXT =======================\n\n"
		./scripts/runIvasCodec.py -m $modes_with_no_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile \| tee smoke_test_output_jbm_noEXT.txt
		echo "\n======================= 5. JBM, modes with EXT =======================\n\n"