Merge branch '1176_ref_enable_reverberator_with_BINAURAL_ROOM_IR' into 'float-pc' (9ab2a275) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+13 −9

Original line number	Diff line number	Diff line
		@@ -291,6 +291,10 @@ stages:
		- (Get-Content -Path "CMakeLists.txt") -replace '# $add_compile_options\("\/WX"$\)', '$1' \| Set-Content -Path "CMakeLists.txt"
		- Get-ChildItem -Path "Workspace_msvc" -Filter "*.vcxproj" \| ForEach-Object { (Get-Content -Path $_.FullName) -replace '<TreatWarningAsError>false', '<TreatWarningAsError>true' \| Set-Content -Path $_.FullName }

		.remove_unsupported_testcases: &remove_unsupported_testcases
		# Note: the --use-main-pc-set arg should only be used on main-pc and float-pc branches
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES --use-main-pc-set

		# From float repo
		# to be reused in MR and LTV-scheduled sanitizer test jobs
		# set CLANG_NUM, SELFTEST_SANITY_TIMEOUT and SELF_TEST_PRM_FILE in before_script section
		@@ -304,7 +308,7 @@ stages:
		- testcase_timeout=$SELFTEST_SANITY_TIMEOUT
		- export UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1

		- python3 ci/remove_unsupported_testcases.py $PRM_FILES
		- *remove_unsupported_testcases

		- exit_code20=0
		- exit_code10=0
		@@ -548,7 +552,7 @@ stages:
		- testcase_timeout=$TESTCASE_TIMEOUT_STV
		- fi

		- python3 ci/remove_unsupported_testcases.py $PRM_FILES
		- *remove_unsupported_testcases
		- if [ $LEVEL_SCALING != "1.0" ];then
		- *apply-testv-scaling
		- fi
		@@ -634,7 +638,7 @@ stages:
		- testcase_timeout=$TESTCASE_TIMEOUT_STV
		- fi

		- python3 ci/remove_unsupported_testcases.py $PRM_FILES
		- *remove_unsupported_testcases
		- if [ $LEVEL_SCALING != "1.0" ];then
		- *apply-testv-scaling
		- fi
		@@ -746,7 +750,7 @@ stages:
		script:
		- *print-common-info
		- *update-scripts-repo
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES
		- *remove_unsupported_testcases
		- *build-reference-and-dut-binaries
		- make clean
		- make -j CLANG=$CLANG_NUM
		@@ -782,7 +786,7 @@ stages:
		- testcase_timeout=$TESTCASE_TIMEOUT_STV
		- fi

		- python3 ci/remove_unsupported_testcases.py $PRM_FILES
		- *remove_unsupported_testcases
		- if [ $LEVEL_SCALING != "1.0" ];then
		- *apply-testv-scaling
		- fi
		@@ -977,7 +981,7 @@ check-first-frame-is-sid:
		- bash ci/run-first-frame-is-sid-test.sh

		# from float
		check-bitexactness-hrtf-rom-and-file:
		.check-bitexactness-hrtf-rom-and-file:
		extends:
		- .test-job-linux
		- .rules-merge-request-to-float-pc
		@@ -1780,7 +1784,7 @@ codec-smoke-test:
		- cp IVAS_cod IVAS_cod_ref
		- cp IVAS_dec IVAS_dec_ref

		- python3 ci/remove_unsupported_testcases.py $PRM_FILES
		- *remove_unsupported_testcases
		# create references
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1
		### run pytest
		@@ -2009,7 +2013,7 @@ ivas-pytest-on-merge-request:
		- *get-commits-behind-count
		- *check-commits-behind-count-in-compare-jobs
		- *merge-request-comparison-setup-codec
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES
		- *remove_unsupported_testcases

		# some helper variables - "\|\| true" to prevent failures from grep not finding anything
		# write to temporary file as workaround for failures observed with piping echo
		@@ -2069,7 +2073,7 @@ ivas-interop-on-merge-request:
		# the next line is dependent on ref-using-main flag in the other tests, but here the flag does not make sense
		- git checkout $source_branch_commit_sha

		- python3 ci/remove_unsupported_testcases.py $PRM_FILES
		- *remove_unsupported_testcases

		# some helper variables - "\|\| true" to prevent failures from grep not finding anything
		# write to temporary file as workaround for failures observed with piping echo

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -204,6 +204,8 @@
		#define FIX_921_OMASA_DELAY_PRINTOUT /* VA: issue 921: correct OMASA decoder delay printout */
		#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA /* FhG: issue 926: crash in OSBA decoding with planar FOA */
		#define FIX_929_RENDERER_CMDL /* Nokia: issue #929: renderer command line option */
		#define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR /* FhG: re-enable acidentially disabled reverberator for BINAURAL_ROOM_IR */
		#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

		/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_binRenderer_internal.c

+20 −3

Original line number	Diff line number	Diff line
		@@ -1225,7 +1225,11 @@ ivas_error ivas_binRenderer_open(
		}

		/* Allocate memories needed for reverb module */
		#ifdef NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM \|\| ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		#else
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		#endif
		{
		if ( ( error = ivas_binaural_reverb_open_fastconv( &( hBinRenderer->hReverb ), hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hIntSetup.output_config, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv ) ) != IVAS_ERR_OK )
		{
		@@ -1233,6 +1237,10 @@ ivas_error ivas_binRenderer_open(
		}

		/* initialize the dmx matrix */
		#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
		if ( hBinRenderer->nInChannels != HOA3_CHANNELS )
		#endif
		{
		for ( chIdx = 0; chIdx < BINAURAL_CHANNELS; chIdx++ )
		{
		for ( k = 0; k < hBinRenderer->nInChannels; k++ )
		@@ -1241,6 +1249,7 @@ ivas_error ivas_binRenderer_open(
		}
		}
		}
		}
		else
		{
		hBinRenderer->hReverb = NULL;
		@@ -1248,9 +1257,17 @@ ivas_error ivas_binRenderer_open(

		hBinRenderer->hEFAPdata = NULL;

		#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
		if ( hBinRenderer->hReverb != NULL && hBinRenderer->nInChannels != HOA3_CHANNELS )
		#else
		if ( hBinRenderer->hReverb != NULL )
		#endif
		{
		#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
		if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 )
		#else
		if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 && hBinRenderer->nInChannels != HOA3_CHANNELS )
		#endif
		{
		for ( k = 0; k < 11; k++ )
		{