Merge branch 'main' into fhg/remove-obsolete-code-in-sns-msvq (5e187983) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+13 −11

Original line number	Diff line number	Diff line
		@@ -909,6 +909,7 @@ clang-format-check:
		- run: git apply $PATCH_FILE_NAME\n
		- commit new changes"

		- format_problems=0
		- scripts/check-format.sh -af -p 8 \|\| format_problems=$?
		- if [ $format_problems == 0 ] ; then exit 0; fi

		@@ -926,7 +927,7 @@ clang-format-check:
		expire_in: 1 day
		paths:
		- tmp-formatting-fix/
		when: always
		when: on_failure
		name: "$ARTIFACT_BASE_NAME"
		expose_as: "formatting patch"

		@@ -948,18 +949,19 @@ check-first-frame-is-sid:
		- cmake .
		- make -j

		# TODO: for some MASA modes, we currently do not have testvectors that actually trigger DTX
		# SBA modes are run separately to use shorter part of file
		- exit_code_no_sba=0
		- exit_code_sba=0
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -v MASA \| grep -vE "FOA\|HOA" )
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 200 -U 0:20 \|\| exit_code_no_sba=$?
		- exit_code_hoa=0
		- exit_code_foa=0

		# run all modes and cut bitstream to start with an SID. Use stereo output to limit runtime, test is only about decoding
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -vE "FOA\|HOA" )
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 200 -U 0:20 --oc stereo \|\| exit_code_no_sba=$?
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -E "HOA")
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 70:80 \|\| exit_code_sba=$?
		# need to do FOA separately as VAD apparently behaves differently there
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 70:80 --oc stereo \|\| exit_code_hoa=$?
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep "FOA")
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 75:110 \|\| exit_code_sba=$?
		- if [ $exit_code_no_sba -ne 0 ] \|\| [ $exit_code_sba -ne 0 ]; then exit 1; fi
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 75:110 --oc stereo \|\| exit_code_foa=$?

		- if [ $exit_code_no_sba -ne 0 ] \|\| [ $exit_code_hoa -ne 0 ] \|\| [ $exit_code_hoa -ne 0 ]; then exit 1; fi
		artifacts:
		paths:
		- out/logs
		@@ -1332,7 +1334,7 @@ sanitizer-test-masa:
		- if: $SANITIZER_SCHEDULE_A
		when: delayed
		start_in: 21 hours
		timeout: 3 hours
		timeout: 5 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS

apps/decoder.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -638,7 +638,7 @@ int main(

		if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, arg.directivityPatternId, renderConfig.directivity ) ) != IVAS_ERR_OK )
		{
		#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
		#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY
		fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );
		#else
		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] );
		@@ -1031,7 +1031,7 @@ static bool parseCmdlIVAS_dec(
		arg->acousticEnvironmentId = 65535;
		for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )
		{
		#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
		#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY
		arg->directivityPatternId[i] = 65535;
		#else
		arg->directivityPatternId[i] = 0;

apps/renderer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2640,7 +2640,7 @@ static CmdlnArgs defaultArgs(

		for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
		{
		#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
		#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY
		args.directivityPatternId[i] = 65535;
		#else
		args.directivityPatternId[i] = 0;

ci/ivas_voip_be_test.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ if [ $BUILD -eq 1 ];then
		fi

		# Configuration
		modes=('SBA_b128_wb_cbr' 'MC_7_1_b96_fb_cbr' 'ISM2_b48_fb_cbr')
		modes=('HOA3_b128_wb_cbr' 'MC_7_1_b96_fb_cbr' 'ISM2_b48_fb_cbr')
		output_formats=('STEREO' 'FOA' '7_1' 'HOA3')
		limit_input_to_x_seconds=30
		verbosity_cmd="-z console"

lib_com/ivas_fb_mixer.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -727,18 +727,21 @@ void ivas_fb_mixer_process(

		void ivas_fb_mixer_get_in_out_mapping(
		const IVAS_FB_CFG fb_cfg, / i : FB config. handle */
		#ifndef REMOVE_UNUSED_FUNCTION
		const int16_t nchan_transport, /* i : number of transport channels */
		const int16_t enc_dec_flag, /* i : encoder or decoder flag */
		const int16_t order, / i : downmix order */
		#endif
		int16_t in_out_mixer_map[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH] /* i/o: mixing mapping */
		)
		{
		int16_t i, j;

		set_s( (int16_t ) in_out_mixer_map, 0, IVAS_MAX_FB_MIXER_OUT_CH IVAS_MAX_SPAR_FB_MIXER_IN_CH );

		#ifndef REMOVE_UNUSED_FUNCTION
		if ( enc_dec_flag == ENC )
		{
		#endif
		if ( fb_cfg->active_w_mixing )
		{
		for ( i = 0; i < fb_cfg->num_out_chans; i++ )
		@@ -757,6 +760,7 @@ void ivas_fb_mixer_get_in_out_mapping(
		in_out_mixer_map[i][0] = 1;
		}
		}
		#ifndef REMOVE_UNUSED_FUNCTION
		}
		else
		{
		@@ -788,7 +792,7 @@ void ivas_fb_mixer_get_in_out_mapping(
		}
		}
		}

		#endif
		return;
		}