Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into... (b6873c57) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

100755 → 100644

+1 −0

Original line number	Diff line number	Diff line
		@@ -157,6 +157,7 @@
		#define FIX_891_PARAMUPMIX_CLEANUP /* Dlb: issue 891: remove unneeded code from ParamUpmix */
		#define FIX_917_LCLD_WARNINGS /* Dlb: issue 917 and 918: fix LCLD codec warnings*/
		#define FIX_920_IGF_INIT_ERROR /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */
		#define FIX_923_EXTERNAL_REND_COMMAND_LINE /* VA: issue 923: enable external renderer command-line options in UPPER case letters */

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

lib_util/cmdln_parser.c

+19 −0

Original line number	Diff line number	Diff line
		@@ -150,7 +150,26 @@ static int8_t optionMatchesString(

		const char *optionName = stringToOptionName( str );

		#ifdef FIX_923_EXTERNAL_REND_COMMAND_LINE
		char optionName_to_upper[FILENAME_MAX];
		strncpy( optionName_to_upper, optionName, sizeof( optionName_to_upper ) - 1 );
		optionName_to_upper[sizeof( optionName_to_upper ) - 1] = '\0';
		to_upper( optionName_to_upper );

		char match_to_upper[FILENAME_MAX];
		strncpy( match_to_upper, opt.props.match, sizeof( match_to_upper ) - 1 );
		optionName_to_upper[sizeof( match_to_upper ) - 1] = '\0';
		to_upper( match_to_upper );

		char matchShort_to_upper[FILENAME_MAX];
		strncpy( matchShort_to_upper, opt.props.matchShort, sizeof( matchShort_to_upper ) - 1 );
		optionName_to_upper[sizeof( matchShort_to_upper ) - 1] = '\0';
		to_upper( matchShort_to_upper );

		if ( strncmp( optionName_to_upper, match_to_upper, MAX_OPTION_LENGTH ) == 0 \|\| strncmp( optionName_to_upper, matchShort_to_upper, MAX_OPTION_LENGTH ) == 0 )
		#else
		if ( strncmp( optionName, opt.props.match, MAX_OPTION_LENGTH ) == 0 \|\| strncmp( optionName, opt.props.matchShort, MAX_OPTION_LENGTH ) == 0 )
		#endif
		{
		return 1;
		}

scripts/config/self_test_ltv.prm

+7 −6

Original line number	Diff line number	Diff line
		@@ -1271,7 +1271,8 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_10pct.g

		// Multi-channel 7_1_4 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 32kHz out, STEREO out, FER at 5%
		../IVAS_cod -mc 7_1_4 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/ltv48_MC714.wav bit
		../IVAS_dec -FER 5 STEREO 32 bit testv/ltv48_MC714.wav_sw_48-32_stereo.tst
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec STEREO 32 bit_error testv/ltv48_MC714.wav_sw_48-32_stereo_FER5.tst

		// Multi-channel 7_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, BINAURAL out
		../IVAS_cod -mc 7_1_4 ../scripts/switchPaths/sw_mctech_5fr.bin 48 testv/ltv48_MC714.wav bit
		@@ -1610,12 +1611,12 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		../IVAS_cod -ism_sba 4 3 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 32 testv/ltv32_OSBA_4ISM_HOA3.wav bit
		../IVAS_dec EXT 48 bit testv/ltv32_OSBA_4ISM_HOA3.wav_EXT_sw_13k2_512k_32-32.tst

		// OSBA FOA 4ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 48kHz out, BINAURAL out, FEC at 5%
		// OSBA FOA 4ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 48kHz out, BINAURAL out, FER at 5%
		// ../IVAS_cod -ism_sba 4 1 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_OSBA_4ISM_FOA.wav bit
		// eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_10pct.g192 bit_error
		// ../IVAS_dec -fec 5 BINAURAL 48 bit_error testv/ltv48_OSBA_4ISM_FOA.wav_BINAURAL_sw_48-48_FEC5.tst
		// eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		// ../IVAS_dec BINAURAL 48 bit_error testv/ltv48_OSBA_4ISM_FOA.wav_BINAURAL_sw_48-48_FER5.tst

		// OSBA 3ISM 2OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, STEREO out, FEC at 10%
		// OSBA 3ISM 2OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, STEREO out, FER at 10%
		// ../IVAS_cod -ism_sba 3 2 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_OSBA_3ISM_2OA.wav bit
		// eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_10pct.g192 bit_error
		// ../IVAS_dec -fec 10 STEREO 32 bit_error testv/ltv48_OSBA_3ISM_2OA.wav_STEREO_sw_48-32_FEC10.tst
		// ../IVAS_dec STEREO 32 bit_error testv/ltv48_OSBA_3ISM_2OA.wav_STEREO_sw_48-32_FER10.tst

Admin message