Merge branch '571-reverb-not-activated-for-discrete-and-parametric-ism' into... (10829f91) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+13 −0

Original line number	Diff line number	Diff line
		@@ -1193,6 +1193,7 @@ coverage-test-on-main-scheduled:
		stage: test
		artifacts:
		name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"
		when: always
		expire_in: 1 week
		paths:
		- $CI_JOB_NAME-public
		@@ -1209,7 +1210,9 @@ complexity-stereo-in-stereo-out:
		- in_format=stereo
		- out_format=stereo
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-ism-in-binaural-out:
		extends:
		@@ -1225,7 +1228,9 @@ complexity-ism-in-binaural-out:
		- in_format=ISM
		- out_format=BINAURAL
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format"
		- ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-sba-hoa3-in-hoa3-out:
		extends:
		@@ -1241,7 +1246,9 @@ complexity-sba-hoa3-in-hoa3-out:
		- in_format=SBA
		- out_format=HOA3
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-mc-in-7_1_4-out:
		extends:
		@@ -1257,7 +1264,9 @@ complexity-mc-in-7_1_4-out:
		- in_format=MC
		- out_format=7_1_4
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-masa-in-7_1_4-out:
		extends:
		@@ -1273,7 +1282,9 @@ complexity-masa-in-7_1_4-out:
		- in_format=MASA
		- out_format=7_1_4
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-StereoDmxEVS-stereo-in-mono-out:
		extends:
		@@ -1289,7 +1300,9 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
		- in_format=StereoDmxEVS
		- out_format=mono
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# ---------------------------------------------------------------
		# Other jobs

ci/complexity_measurements/getWmops.sh

+4 −1

Original line number	Diff line number	Diff line
		@@ -53,8 +53,11 @@ config_file="scripts/config/ci_linux_ltv.json"
		wmopsFilenameFlcLast=wmops_newsletter_stereo__${commit_sha}_${date}
		wmopsFilenameFlc=${destDir}/wmops/logs/${wmopsFilenameFlcLast}

		ret_val=0

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

		# get the info on worst-case operating point: WMOPS number, enc-operating mode, dec-operating mode
		### WMOPS
		@@ -83,4 +86,4 @@ ${scriptDir}/parseNewsletterRom.py ${wmopsFilenameFlc}_PROM.csv ${wmopsFilenameF
		# generate java script from database
		tcsh ${scriptDir}/genWebpageData_Rom.csh ${destDir}/wmops/log_rom_all.txt ${destDir}/wmops/graphs_rom_flc.js Graphs_ROM


		exit $ret_val
		No newline at end of file

lib_dec/ivas_ism_dec.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,15 @@ static ivas_error ivas_ism_bitrate_switching(
		{
		return error;
		}
		#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM
		if ( st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		#endif
		}
		}
		else
		@@ -258,6 +267,14 @@ static ivas_error ivas_ism_bitrate_switching(
		{
		st_ivas->hHrtfTD = NULL;
		}

		#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM
		if (st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB)
		{
		ivas_reverb_close( &st_ivas->hReverb );
		}

		#endif
		}
		}
		else