Merge branch '1225-disclaimer-missing-for-renderer-and-post-renderer' of... (c18c0b93) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+15 −8

Original line number	Diff line number	Diff line
		@@ -456,24 +456,31 @@ check-compatibility-with-basop-reference-branch:
		- cp ivas-basop/IVAS_dec ./IVAS_dec # Not used but needed to launch the pytest
		- python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm
		- python3 tests/create_short_testvectors.py
		- exit_code1=0
		- exit_code2=0
		- python3 -m pytest tests/codec_be_on_mr_nonselection -v --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml \|\| exit_code1=$?
		- zero_errors=$(cat report-junit.xml \| grep -c 'errors="0"') \|\| true
		- if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi

		- python3 -m pytest tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test.prm -v --update_ref 1 --html=report-selftest-full.html --self-contained-html --junit-xml=report-junit-selftest-full.xml \|\| true
		- zero_errors=$(cat report-junit-selftest-full.xml \| grep -c 'errors="0"') \|\| true
		- if [ $zero_errors != 1 ]; then echo "Run errors encountered with scripts/config/self_test.prm !"; exit $EXIT_CODE_FAIL; fi

		- python3 -m pytest tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_basop_encoder.prm -v --update_ref 1 --html=report-selftest-basop-encoder.html --self-contained-html --junit-xml=report-junit-selftest-basop-encoder.xml \|\| true
		- zero_errors=$(cat report-junit-selftest-basop-encoder.xml \| grep -c 'errors="0"') \|\| true
		- if [ $zero_errors != 1 ]; then echo "Run errors encountered with scripts/config/self_test_basop_encoder.prm !"; exit $EXIT_CODE_FAIL; fi

		- exit 0
		artifacts:
		name: "check-float-reference--sha-$CI_COMMIT_SHORT_SHA--results"
		when: always
		expire_in: 1 month
		paths:
		- report-junit.xml
		- report.html
		- report-junit-selftest-full.xml
		- report-junit-selftest-basop-encoder.xml
		- report-selftest-full.html
		- report-selftest-basop-encoder.html

		expose_as: "check-float-reference results"
		reports:
		junit:
		- report-junit.xml
		- report-junit-selftest-full.xml
		- report-junit-selftest-basop-encoder.xml

		# ---------------------------------------------------------------
		# Build jobs

apps/decoder.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -3775,13 +3775,17 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile(

		if ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_TDREND \|\| binaural_renderer_sec == IVAS_BIN_RENDERER_TYPE_TDREND \|\| binaural_renderer == IVAS_BIN_RENDERER_TYPE_DEFAULT )
		{
		if ( ( error = IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfBinary->hHrtfTD ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_GetHrtfTDrendHandle( hIvasDec, &hHrtfBinary->hHrtfTD ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		fprintf( stderr, "\nIVAS_DEC_GetHrtfTDrendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		return error;
		}

		#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE
		if ( ( error = load_TDrend_HRTF_binary( *hHrtfBinary->hHrtfTD, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = load_HRTF_binary( *hHrtfBinary->hHrtfTD, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		@@ -3881,11 +3885,15 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile(
		}
		}

		#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE
		if ( hHrtfBinary->hHrtfStatistics == NULL && ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV \|\| binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND ) && OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		#else
		if ( hHrtfBinary->hHrtfStatistics == NULL )
		#endif
		{
		if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfBinary->hHrtfStatistics ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		fprintf( stderr, "\nIVAS_DEC_GetHrtfStatisticsHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		return error;
		}

apps/renderer.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -957,7 +957,11 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE
		if ( ( error = load_TDrend_HRTF_binary( *hHrtfTD, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{

ci/complexity_measurements/getWmops.sh

+14 −4

Original line number	Diff line number	Diff line
		@@ -29,11 +29,11 @@
		# the United Nations Convention on Contracts on the International Sales of Goods.

		function usage {
		echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\" \"mode{full(default)\|mem_only}\" \"repo{float(default)\|basop}\" "
		echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\" \"mode{full(default)\|mem_only}\" \"repo{float(default)\|basop}\" [wmops_ref_logfile]"
		exit 1
		}

		if [ $# -ne 2 ] && [ $# -ne 3 ] && [ $# -ne 4 ]; then
		if [ $# -ne 2 ] && [ $# -ne 3 ] && [ $# -ne 4 ] && [ $# -ne 5 ]; then
		usage
		fi

		@@ -50,7 +50,7 @@ if [ $# -ge 3 ]; then
		fi

		repo_arg_script=""
		if [ $# -eq 4 ]; then
		if [ $# -ge 4 ]; then
		if [ "$4" = "basop" ]; then
		repo_arg_script="--basop"
		elif [ "$4" != "float" ]; then
		@@ -58,6 +58,11 @@ if [ $# -eq 4 ]; then
		fi
		fi

		wmops_ref_logfile=""
		if [ $# -eq 5 ]; then
		wmops_ref_logfile=$5
		fi

		date=$(date +%Y%m%d) # used for log-file file ending
		shortDate=$(date "+%b %d" \| sed -e "s/\ /_/g") # stored in the log-file
		fullDate=$(date "+%c" \| sed -e "s/\ /_/g") # stored in the log-file
		@@ -106,7 +111,12 @@ ${scriptDir}/mergeNewsletterRom.py ${wmopsFilenameFlc}_PROM.csv ${wmopsFilenameF
		${scriptDir}/parseNewsletterRom.py ${wmopsFilenameFlc}_PROM.csv ${wmopsFilenameFlc}_TROM.csv ${wmopsFilenameFlcLast}_ROM.csv ${commit_sha} ${shortDate} ${fullDate} >>${destDir}/wmops/log_rom_all.txt

		# generate javascript code from log files
		# pass the ref log for comparison only if arg is given
		if [ "$wmops_ref_logfile" != "" ]; then
		python3 ci/complexity_measurements/genWebpageData.py ${destDir}/wmops/log_wmops_all.txt ${wmopsFilenameFlc}_WMOPS.csv ${destDir}/wmops/log_rom_all.txt ${destDir}/wmops/log_ram_all.txt --wmops_per_op_log_for_comparison $wmops_ref_logfile
		else
		python3 ci/complexity_measurements/genWebpageData.py ${destDir}/wmops/log_wmops_all.txt ${wmopsFilenameFlc}_WMOPS.csv ${destDir}/wmops/log_rom_all.txt ${destDir}/wmops/log_ram_all.txt
		fi

		python3 ${scriptDir}/check_for_changes.py ${destDir}/wmops/log_wmops_all.txt ${destDir}/wmops/log_ram_all.txt ${destDir}/wmops/log_rom_all.txt
		if [ "$?" != "0" ]; then

lib_com/ivas_error.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,9 @@ typedef enum
		IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,
		IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED,
		IVAS_ERR_INVALID_HRTF,
		#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE
		IVAS_ERR_INVALID_HRTF_SAMPLING_RATE,
		#endif
		IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA,
		IVAS_ERR_INVALID_INPUT_FORMAT,
		IVAS_ERR_INVALID_INDEX,
		@@ -259,6 +262,10 @@ static inline const char *ivas_error_to_string( ivas_error error_code )
		return "Objects editing not supported";
		case IVAS_ERR_INVALID_HRTF:
		return "Unsupported HRTF filter set";
		#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE
		case IVAS_ERR_INVALID_HRTF_SAMPLING_RATE:
		return "Wrong sampling rate in HRTF binary file";
		#endif
		case IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA:
		return "Renderer data missing in HRTF binary file";
		case IVAS_ERR_INVALID_INPUT_FORMAT: