Merge branch 'update-float-pc-with-ivas-float-update' into 'float-pc' (405ffc65) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+36 −47

Original line number	Diff line number	Diff line
		@@ -205,7 +205,6 @@ stages:
		- git restore .
		- git checkout $current_commit_sha


		.build-reference-and-dut-binaries: &build-reference-and-dut-binaries
		### build reference binaries
		- *build-reference-binaries
		@@ -1916,21 +1915,11 @@ ivas-interop-on-merge-request:
		- rm artifacts.zip
		- rm -rf $public_dir

		### 2. part: setup specific for BASOP repo
		# hack for using the reference encoder -> need to build manually to make script use ref enc and BASOP dec
		- mkdir COMPLEXITY
		- cp IVAS_cod_ref COMPLEXITY/IVAS_cod
		# build branch code aain with instrumentation
		- make clean
		- bash scripts/prepare_instrumentation.sh -p BASOP -m MEM_ONLY
		- make -j -C $INSTR_DIR
		- cp $INSTR_DIR/IVAS_dec COMPLEXITY/IVAS_dec

		.complexity-measurements-prepare-artifacts:
		&complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory
		- public_dir="$CI_JOB_NAME-public"
		- mkdir $public_dir
		- mv -f wmops/log__all.txt wmops/.js ${public_dir}/
		- mv -f wmops/log__all.txt ./.js ${public_dir}/
		# move logfiles for links
		- mkdir $public_dir/logs
		# first move logs
		@@ -1938,6 +1927,7 @@ ivas-interop-on-merge-request:
		- echo $log_files
		- ls wmops/logs
		- for f in $log_files; do [ -f wmops/logs/$f ] && mv wmops/logs/$f $public_dir/logs/$f; done
		- mv wmops/logs/latest_WMOPS.csv $public_dir/logs/
		# copy index page blueprint
		- cp ci/complexity_measurements/index_complexity.html ${public_dir}/index.html
		# patch the format in the title
		@@ -1957,7 +1947,6 @@ ivas-interop-on-merge-request:
		- *print-common-info
		- *update-scripts-repo
		- *update-ltv-repo
		- *build-reference-and-dut-binaries
		- *complexity-measurements-setup
		- which coan
		artifacts:
		@@ -1975,7 +1964,7 @@ complexity-stereo-in-stereo-out:
		script:
		- in_format=stereo
		- out_format=stereo
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1990,7 +1979,7 @@ complexity-ism-in-binaural-out:
		- in_format=ISM
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2005,7 +1994,7 @@ complexity-ism-in-binaural_room_ir-out:
		- in_format=ISM
		- out_format=BINAURAL_ROOM_IR
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2015,12 +2004,12 @@ complexity-ism-in-ext-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 3 hours 30 minutes
		start_in: 3 hours
		script:
		- in_format=ISM
		- out_format=EXT
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2030,12 +2019,12 @@ complexity-sba-hoa3-in-hoa3-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 4 hours 30 minutes
		start_in: 4 hours
		script:
		- in_format=HOA3
		- out_format=HOA3
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2045,12 +2034,12 @@ complexity-sba-hoa3-in-binaural-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 5 hours 30 minutes
		start_in: 5 hours
		script:
		- in_format=HOA3
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2060,12 +2049,12 @@ complexity-sba-hoa3-in-binaural_room_ir-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 6 hours 30 minutes
		start_in: 6 hours
		script:
		- in_format=HOA3
		- out_format=BINAURAL_ROOM_IR
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2075,12 +2064,12 @@ complexity-mc-in-7_1_4-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 7 hours 30 minutes
		start_in: 7 hours
		script:
		- in_format=MC
		- out_format=7_1_4
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2090,12 +2079,12 @@ complexity-mc-in-binaural-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 10 hours
		start_in: 8 hours
		script:
		- in_format=MC
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2105,12 +2094,12 @@ complexity-mc-in-binaural_room_ir-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 12 hours 30 minutes
		start_in: 9 hours
		script:
		- in_format=MC
		- out_format=BINAURAL_ROOM_IR
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2120,12 +2109,12 @@ complexity-masa-in-ext-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 15 hours
		start_in: 10 hours
		script:
		- in_format=MASA
		- out_format=EXT
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2135,12 +2124,12 @@ complexity-masa-in-binaural-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 16 hours
		start_in: 11 hours
		script:
		- in_format=MASA
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2150,12 +2139,12 @@ complexity-masa-in-hoa3-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 17 hours
		start_in: 12 hours
		script:
		- in_format=MASA
		- out_format=HOA3
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2170,7 +2159,7 @@ complexity-masa-in-hoa3-out:
		# - in_format=OMASA
		# - out_format=EXT
		# - ret_val=0
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val

		@@ -2180,12 +2169,12 @@ complexity-omasa-in-binaural-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 18 hours
		start_in: 14 hours
		script:
		- in_format=OMASA
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2195,12 +2184,12 @@ complexity-omasa-in-hoa3-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 20 hours
		start_in: 15 hours
		script:
		- in_format=OMASA
		- out_format=HOA3
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2210,12 +2199,12 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 22 hours
		start_in: 16 hours
		script:
		- in_format=StereoDmxEVS
		- out_format=mono
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2240,7 +2229,7 @@ complexity-osba-in-binaural-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 22 hours 30 minutes
		start_in: 18 hours
		script:
		- in_format=OSBA
		- out_format=BINAURAL
		@@ -2255,7 +2244,7 @@ complexity-osba-in-binaural_room_ir-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 25 hours
		start_in: 19 hours
		script:
		- in_format=OSBA
		- out_format=BINAURAL_ROOM_IR
		@@ -2276,7 +2265,7 @@ pages:
		- *update-scripts-repo
		- python3 ci/setup_pages.py
		- ls
		- ls -lh public
		- ls public
		artifacts:
		paths:
		- public

apps/encoder.c

+41 −1

Original line number	Diff line number	Diff line
		@@ -368,6 +368,15 @@ int main(
		goto cleanup;
		}

		#ifdef SUPPORT_FORCE_TCX10_TCX20
		#ifdef DEBUGGING
		if ( arg.forcedMode == IVAS_ENC_FORCE_TCX10 && totalBitrate < 48000 )
		{
		fprintf( stderr, "Warning: Enforcing the TCX10 mode is only supported for bitrates higher or equal than 48 kbps!\n\n" );
		}
		#endif
		#endif

		/------------------------------------------------------------------------------------------
		* Configure and initialize (allocate memory for static variables) the encoder
		------------------------------------------------------------------------------------------/
		@@ -1056,7 +1065,24 @@ static bool parseCmdlIVAS_enc(
		}
		else
		{
		#ifdef SUPPORT_FORCE_TCX10_TCX20
		if ( arg->forcedMode == IVAS_ENC_FORCE_TCX10 )
		{
		strcpy( stmp, "TCX10" );
		}
		else if ( arg->forcedMode == IVAS_ENC_FORCE_TCX20 )
		{
		strcpy( stmp, "TCX20" );
		}
		else
		{
		strncpy( stmp, argv[i + 1], sizeof( stmp ) );
		}

		fprintf( stdout, "Forcing codec to: %s\n", stmp );
		#else
		fprintf( stdout, "Forcing codec to: %s\n", argv[i + 1] );
		#endif
		}

		i += 2;
		@@ -2033,10 +2059,24 @@ static IVAS_ENC_FORCED_MODE parseForcedMode(
		{
		return IVAS_ENC_FORCE_GSC;
		}
		if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'TCX'" ) == 0 ) )
		if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'TCX'" ) == 0 )
		#ifdef SUPPORT_FORCE_TCX10_TCX20
		\|\| ( strcmp( forcedModeChar, "TCX20" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'TCX20'" ) == 0 )
		#endif
		)
		{
		#ifdef SUPPORT_FORCE_TCX10_TCX20
		return IVAS_ENC_FORCE_TCX20;
		#else
		return IVAS_ENC_FORCE_TCX;
		#endif
		}
		#ifdef SUPPORT_FORCE_TCX10_TCX20
		if ( ( strcmp( forcedModeChar, "TCX10" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'TCX10'" ) == 0 ) )
		{
		return IVAS_ENC_FORCE_TCX10;
		}
		#endif
		if ( ( strcmp( forcedModeChar, "HQ" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'HQ'" ) == 0 ) )
		{
		return IVAS_ENC_FORCE_HQ;

apps/renderer.c

+44 −0

Original line number	Diff line number	Diff line
		@@ -637,6 +637,8 @@ int main(
		lfeRoutingConfigs[i] = NULL;
		}

		IVAS_REND_PrintDisclaimer();

		CmdlnArgs args = parseCmdlnArgs( argc, argv );

		if ( args.nonDiegeticPan && !( ( args.inConfig.numAudioObjects == 0 && args.inConfig.multiChannelBuses[0].audioConfig == IVAS_AUDIO_CONFIG_MONO ) \|\|
		@@ -796,6 +798,48 @@ int main(
		exit( -1 );
		}

		fprintf( stdout, "Input audio file: %s\n", args.inputFilePath );
		fprintf( stdout, "Output audio file: %s\n\n", args.outputFilePath );

		if ( args.inConfig.numAudioObjects > 0 )
		{
		if ( args.inConfig.numAudioObjects == 1 )
		{
		IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM1 );
		}
		else if ( args.inConfig.numAudioObjects == 2 )
		{
		IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM2 );
		}
		else if ( args.inConfig.numAudioObjects == 3 )
		{
		IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM3 );
		}
		else if ( args.inConfig.numAudioObjects == 4 )
		{
		IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM4 );
		}
		}
		for ( i = 0; i < args.inConfig.numMultiChannelBuses; i++ )
		{
		IVAS_REND_PrintInputConfig( args.inConfig.multiChannelBuses[i].audioConfig );
		}
		for ( i = 0; i < args.inConfig.numMasaBuses; i++ )
		{
		IVAS_REND_PrintInputConfig( args.inConfig.masaBuses[i].audioConfig );
		}
		for ( i = 0; i < args.inConfig.numAmbisonicsBuses; i++ )
		{
		IVAS_REND_PrintInputConfig( args.inConfig.ambisonicsBuses[i].audioConfig );
		}

		if ( ( error = IVAS_REND_PrintConfig( hIvasRend ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\n IVAS_REND_PrintConfig failed: %s\n\n", ivas_error_to_string( error ) );
		// goto cleanup;
		exit( -1 );
		}

		/* === Configure === */
		if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )
		{

lib_com/cnst.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -81,8 +81,14 @@
		#define FORCE_MUSIC 101 /* debugging - force music on the command line */
		#define FORCE_ACELP 102 /* debugging - force ACELP core on the command line */
		#define FORCE_GSC 103 /* debugging - force GSC core on the command line */
		#ifdef SUPPORT_FORCE_TCX10_TCX20
		#define FORCE_TCX10 104 /* debugging - force TCX10 core on the command line */
		#define FORCE_TCX20 105 /* debugging - force TCX20 core on the command line */
		#define FORCE_HQ 106 /* debugging - force HQ core on the command line */
		#else
		#define FORCE_TCX 104 /* debugging - force TCX core on the command line */
		#define FORCE_HQ 105 /* debugging - force HQ core on the command line */
		#endif
		#define FORCE_TD_RENDERER 201
		#define FORCE_CLDFB_RENDERER 202
		#endif

lib_com/disclaimer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ int16_t print_disclaimer( FILE *fPtr )
		{

		fprintf( fPtr, "\n==================================================================================================\n" );
		fprintf( fPtr, " IVAS Codec Baseline\n" );
		fprintf( fPtr, " \n IVAS Codec Version IVAS-FL-1.0\n" );
		fprintf( fPtr, " \n" );
		fprintf( fPtr, " Based on EVS Codec (Floating Point) 3GPP TS26.443 Nov 04, 2021,\n" );
		fprintf( fPtr, " Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0\n" );