- Merge remote-tracking branch 'remotes/origin/main' into 1303-renderer-granularity-revision (8abf39ec) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+3 −0

Original line number	Diff line number	Diff line
		@@ -2464,6 +2464,9 @@ coverage-test-on-main-scheduled:
		- *print-common-info
		- *update-ltv-repo
		- *complexity-measurements-setup
		allow_failure:
		exit_codes:
		- 123
		artifacts:
		name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"
		when: always

CMakeLists.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		# cmake --build . --config Release


		cmake_minimum_required(VERSION 3.1)
		cmake_minimum_required(VERSION 3.10)

		set(CMAKE_C_STANDARD 99)

		@@ -121,7 +121,7 @@ if(WMOPS)
		add_definitions("-DWMOPS=1")
		endif()

		project(stereo-evs)
		project(stereo-evs LANGUAGES C)
		set_property(GLOBAL PROPERTY USE_FOLDERS ON) # make Visual Studio projects look nicer
		include(CTest)

apps/isar_post_rend.c

+21 −0

Original line number	Diff line number	Diff line
		@@ -985,6 +985,9 @@ int main(

		while ( 1 )
		{
		#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
		int16_t bfi = 0;
		#endif
		int16_t num_in_channels;
		num_in_channels = inBuffer.config.numChannels;

		@@ -993,7 +996,11 @@ int main(
		{
		ivas_error error_tmp;
		numSamplesRead = (int16_t) inBufferSize;
		#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
		error_tmp = split_rend_read_bits_from_file( hSplitRendFileReadWrite, bitsBuffer.bits, &bitsBuffer.config.bitsRead, &bitsBuffer.config.bitsWritten, &bfi );
		#else
		error_tmp = split_rend_read_bits_from_file( hSplitRendFileReadWrite, bitsBuffer.bits, &bitsBuffer.config.bitsRead, &bitsBuffer.config.bitsWritten );
		#endif
		if ( error_tmp != IVAS_ERR_OK )
		{
		if ( error_tmp == IVAS_ERR_END_OF_FILE )
		@@ -1060,19 +1067,33 @@ int main(
		/* Read from split renderer bfi file if specified */
		if ( splitRendBFIReader != NULL && splitBinNeedsNewFrame )
		{
		#ifndef NONBE_1293_CRASH_FIRST_FRAME_LOST
		int16_t bfi;
		#endif
		if ( ( error = SplitRendBFIFileReading( splitRendBFIReader, &bfi ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in SplitRendBFIFileReading(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		#ifndef NONBE_1293_CRASH_FIRST_FRAME_LOST
		if ( ( error = ISAR_POST_REND_SetSplitRendBFI( hIsarPostRend, bfi ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in ISAR_POST_REND_SetSplitRendBFI(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		#endif
		}
		#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
		if ( splitBinNeedsNewFrame )
		{
		if ( ( error = ISAR_POST_REND_SetSplitRendBFI( hIsarPostRend, bfi ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in ISAR_POST_REND_SetSplitRendBFI(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}
		#endif

		for ( i = 0; i < args.inConfig.numBinBuses; ++i )
		{

ci/complexity_measurements/getWmops.sh

+4 −3

Original line number	Diff line number	Diff line
		@@ -72,8 +72,6 @@ wmopsFilenameFlcLast=wmops_newsletter_${ivas_format_for_filename}_to_${output_fo
		wmopsFilenameFlcDir=${destDir}/wmops/logs
		wmopsFilenameFlc=${wmopsFilenameFlcDir}/${wmopsFilenameFlcLast}

		ret_val=0

		mode_arg=""
		# for OSBA, there are just too many modes... -> only select HOA3 ones
		if [ "$ivas_format" == "OSBA" ]; then
		@@ -83,7 +81,7 @@ fi

		# instrument and build
		./scripts/IvasBuildAndRunChecks.py $mode_arg_script -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format $mode_arg -f ${ep} --oc $output_format
		ret_val=$?
		ret_val_script=$?

		# TODO: only split wmops and ram files
		./ci/complexity_measurements/split_by_levels.py $(ls ${wmopsFilenameFlc}*.csv)
		@@ -137,8 +135,11 @@ else
		python3 ci/complexity_measurements/genWebpageData.py --wmops_per_op_log ${wmopsFilenameFlc}_WMOPS.csv --rom_log ${log_rom_all}
		fi

		ret_val=0
		python3 ${scriptDir}/check_for_changes.py --wmops_logfiles $(ls ${destDir}/wmops/log_wmops_all.txt) --ram_logfiles $(ls ${destDir}/wmops/log_ram_all.txt) --rom_logfile ${destDir}/wmops/log_rom_all.txt
		if [ "$?" != "0" ]; then
		ret_val=123
		elif [ "$ret_val_script" != "0" ]; then
		ret_val=1
		fi

ci/setup_pages.py

+5 −0

Original line number	Diff line number	Diff line
		@@ -156,6 +156,11 @@ def get_artifacts_for_jobs_and_return_num_failed(
		tmp_dir = pathlib.Path(tmp_dir)

		for artifact in tmp_dir.iterdir():
		# ignore the COMPLEXITY dir from complexity measurement, that one only contins runtime logs
		# and creates problems because it has the same name for every complexity job
		if artifact.name == "COMPLEXITY":
		continue

		src = tmp_dir.joinpath(artifact).absolute()
		dst = PUBLIC_FOLDER.joinpath(artifact.name)
		print(f"{src} -> {dst}")