Merge remote-tracking branch 'remotes/origin/main' into... (cffc2200) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+12 −10

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

CMakeLists.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -154,7 +154,7 @@ endif()
		if(INCLUDE_SPLIT)
		file(GLOB libLC3plusSrcs "lib_lc3plus/*.c")
		file(GLOB libLC3plusHeaders "lib_lc3plus/*.h")
		add_library(lc3plus ${libLC3plusSrcs} ${libLC3plusHeaders})
		add_library(lib_lc3plus ${libLC3plusSrcs} ${libLC3plusHeaders})
		target_include_directories(lib_lc3plus PUBLIC lib_lc3plus)
		target_link_libraries(lib_lc3plus lib_com) # For including options.h, which is needed for instrumentation to work correctly
		if(WMOPS)

apps/decoder.c

+7 −21

Original line number	Diff line number	Diff line
		@@ -439,9 +439,7 @@ int main(
		#ifdef FIX_708_DPID_COMMAND_LINE
		arg.Opt_dpid_on,
		#endif
		#ifdef FIX_708_AEID_COMMAND_LINE
		arg.acousticEnvironmentId,
		#endif
		arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -640,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] );
		@@ -658,11 +656,7 @@ int main(
		goto cleanup;
		}
		}
		#ifdef FIX_708_AEID_COMMAND_LINE
		else
		#else
		else if ( error != IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING )
		#endif
		{
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", arg.acousticEnvironmentId );
		goto cleanup;
		@@ -1034,14 +1028,10 @@ static bool parseCmdlIVAS_dec(
		arg->noBadFrameDelay = false;
		#endif
		#endif
		#ifdef FIX_708_AEID_COMMAND_LINE
		arg->acousticEnvironmentId = 65535;
		#else
		arg->acousticEnvironmentId = 0;
		#endif
		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;
		@@ -1417,7 +1407,6 @@ static bool parseCmdlIVAS_dec(
		else if ( strcmp( argv_to_upper, "-AEID" ) == 0 )
		{
		++i;
		#ifdef FIX_708_AEID_COMMAND_LINE
		if ( argc - i <= 4 )
		{
		fprintf( stderr, "Error: Acoustic environment ID not specified!\n\n" );
		@@ -1431,7 +1420,6 @@ static bool parseCmdlIVAS_dec(
		usage_dec();
		return false;
		}
		#endif
		arg->acousticEnvironmentId = (int16_t) atoi( argv[i++] );
		}
		else if ( strcmp( argv_to_upper, "-DPID" ) == 0 )
		@@ -1576,7 +1564,12 @@ static bool parseCmdlIVAS_dec(
		return false;
		}

		#ifdef FIX_807_VARIABLE_SPEED_DECODING
		if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) && ( !arg->tsmEnabled ) )
		#else
		if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) )
		#endif

		{
		arg->enable5ms = false;
		}
		@@ -2476,18 +2469,11 @@ static ivas_error decodeG192(
		{
		// update_mem(); TODO: verify this
		update_wmops();
		#ifdef FIX_RAM_COUNTING_5MS_RENDERING
		update_mem();
		#ifdef MEM_COUNT_DETAILS
		export_mem( "mem_analysis.csv" );
		#endif
		#endif
		}
		#ifndef FIX_RAM_COUNTING_5MS_RENDERING
		#ifdef MEM_COUNT_DETAILS
		export_mem( "mem_analysis.csv" );
		#endif
		#endif
		#endif
		}

apps/renderer.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -2640,18 +2640,14 @@ 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;
		#endif
		}

		#ifdef FIX_708_AEID_COMMAND_LINE
		args.acousticEnvironmentId = 65535;
		#else
		args.acousticEnvironmentId = 0;
		#endif

		return args;
		}
		@@ -2819,13 +2815,11 @@ static void parseOption(
		break;
		case CmdLnOptionId_acousticEnvironmentId:
		assert( numOptionValues == 1 );
		#ifdef FIX_708_AEID_COMMAND_LINE
		if ( !is_digits_only( optionValues[0] ) )
		{
		fprintf( stderr, "Invalid acousting environment ID specified: %s\n", optionValues[0] );
		exit( -1 );
		}
		#endif
		args->acousticEnvironmentId = (int16_t) strtol( optionValues[0], NULL, 10 );
		break;
		case CmdLnOptionId_syncMdDelay:

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"

Admin message