Merge branch 'main' into 1019-socket-interface-for-pose-and-audio (3191f36c) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+69 −24

Original line number	Diff line number	Diff line
		@@ -2297,16 +2297,16 @@ complexity-stereo-in-ext-out:
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-ism-in-binaural_room_ir-out:
		complexity-ism-in-binaural_room_reverb-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 1 hour
		when: delayed
		start_in: 1 hour
		script:
		- in_format=ISM
		- out_format=BINAURAL_ROOM_IR
		- out_format=BINAURAL_ROOM_REVERB
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		@@ -2317,8 +2317,8 @@ complexity-ism-in-ext-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 2 hour
		when: delayed
		start_in: 3 hour
		script:
		- in_format=ISM
		- out_format=EXT
		@@ -2332,8 +2332,8 @@ complexity-sba-hoa3-in-ext-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 3 hours
		when: delayed
		start_in: 4 hours
		script:
		- in_format=HOA3
		- out_format=EXT
		@@ -2347,8 +2347,8 @@ complexity-sba-hoa3-in-binaural_room_ir-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 4 hours
		when: delayed
		start_in: 5 hours
		script:
		- in_format=HOA3
		- out_format=BINAURAL_ROOM_IR
		@@ -2362,8 +2362,8 @@ complexity-mc-in-ext-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 5 hours
		when: delayed
		start_in: 6 hours
		script:
		- in_format=MC
		- out_format=EXT
		@@ -2377,8 +2377,8 @@ complexity-mc-in-binaural_room_ir-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 6 hours
		when: delayed
		start_in: 7 hours
		script:
		- in_format=MC
		- out_format=BINAURAL_ROOM_IR
		@@ -2392,8 +2392,8 @@ complexity-masa-in-ext-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 7 hours
		when: delayed
		start_in: 8 hours
		script:
		- in_format=MASA
		- out_format=EXT
		@@ -2407,8 +2407,8 @@ complexity-masa-in-binaural-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 8 hours
		when: delayed
		start_in: 9 hours
		script:
		- in_format=MASA
		- out_format=BINAURAL
		@@ -2417,13 +2417,28 @@ complexity-masa-in-binaural-out:
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-masa-in-hoa3-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 10 hours
		script:
		- in_format=MASA
		- out_format=HOA3
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-omasa-in-ext-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 9 hours
		when: delayed
		start_in: 11 hours
		script:
		- in_format=OMASA
		- out_format=EXT
		@@ -2437,8 +2452,8 @@ complexity-omasa-in-binaural-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 10 hours
		when: delayed
		start_in: 12 hours
		script:
		- in_format=OMASA
		- out_format=BINAURAL
		@@ -2452,8 +2467,8 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 11 hours
		when: delayed
		start_in: 13 hours
		script:
		- in_format=StereoDmxEVS
		- out_format=mono
		@@ -2462,6 +2477,36 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-osba-in-ext-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 14 hours
		script:
		- in_format=OSBA
		- out_format=EXT
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-osba-in-binaural_room_ir-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 15 hours
		script:
		- in_format=OSBA
		- out_format=BINAURAL_ROOM_IR
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

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

ci/setup_pages.py

+14 −9

Original line number	Diff line number	Diff line
		@@ -14,14 +14,14 @@ PROJECT_ID_BASOP_REPO = 77
		# job names -> hyperlink strings for the landing page
		JOBS_FLOAT_REPO = {
		# old ones no longer running -> replaced by "ext" jobs, remove after some time
		"complexity-stereo-in-stereo-out": "[OLD] Stereo in, stereo out",
		"complexity-ism-in-binaural-out": "[OLD] ISM in, BINAURAL out",
		"complexity-sba-hoa3-in-hoa3-out": "[OLD] HOA3 in, HOA3 out",
		"complexity-mc-in-7_1_4-out": "[OLD] MC in, 7_1_4 out",
		"complexity-masa-in-7_1_4-out": "[OLD] Masa in, 7_1_4 out",
		# "complexity-stereo-in-stereo-out": "[OLD] Stereo in, stereo out",
		# "complexity-sba-hoa3-in-hoa3-out": "[OLD] HOA3 in, HOA3 out",
		# "complexity-mc-in-7_1_4-out": "[OLD] MC in, 7_1_4 out",
		# "complexity-masa-in-7_1_4-out": "[OLD] Masa in, 7_1_4 out",
		# current ones
		"complexity-stereo-in-ext-out": "Stereo in, EXT out",
		"complexity-ism-in-binaural_room_ir-out": "ISM in, BINAURAL_ROOM_IR out",
		"complexity-ism-in-binaural_room_reverb-out": "ISM in, BINAURAL_ROOM_REVERB out",
		"complexity-ism-in-binaural-out": "ISM in, BINAURAL out",
		"complexity-ism-in-ext-out": "ISM in, EXT out",
		"complexity-sba-hoa3-in-ext-out": "HOA3 in, EXT out",
		"complexity-sba-hoa3-in-binaural_room_ir-out": "HOA3 in, BINAURAL_ROOM_IR out",
		@@ -29,10 +29,13 @@ JOBS_FLOAT_REPO = {
		"complexity-mc-in-binaural_room_ir-out": "MC in, BINAURAL_ROOM_IR out",
		"complexity-masa-in-ext-out": "MASA in, EXT out",
		"complexity-masa-in-binaural-out": "MASA in, BINAURAL out",
		"complexity-masa-in-hoa3-out": "MASA in, HOA3 out",
		"complexity-omasa-in-ext-out": "OMASA in, EXT out",
		"complexity-omasa-in-binaural-out": "OMASA in, BINAURAL out",
		# "timeless" jobs (survivors from the old jobs or not complexity)
		"complexity-osba-in-ext-out": "OSBA in, EXT out",
		"complexity-osba-in-binaural_room_ir-out": "OSBA in, BINAURAL_ROOM_IR out",
		"complexity-StereoDmxEVS-stereo-in-mono-out": "StereoDmxEVS, Stereo in, Mono out",
		# "timeless" jobs (not complexity)
		"coverage-test-on-main-scheduled": "Coverage",
		}
		JOBS_BASOP_REPO = [
		@@ -79,6 +82,7 @@ def create_landing_page_float_repo(jobs, index_html):
		# dynamically create the complexity links on the landing page
		link_html = list()
		link_html = ["<ul>"]

		for job, link_text in jobs.items():
		if job.startswith("complexity"):
		line = f'<li><a href="{job}-public/index.html">{link_text}</a></li>'
		@@ -89,9 +93,10 @@ def create_landing_page_float_repo(jobs, index_html):
		index_pages_tmpl_path = (
		pathlib.Path(__file__).parent.joinpath("index-pages.html").absolute()
		)

		with open(index_pages_tmpl_path) as f:
		index_pages_tmpl = f.read()
		print(index_pages_tmpl)

		index_pages_tmpl = index_pages_tmpl.format(link_html_text)

		with open(index_html, "w") as f:

lib_com/options.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -164,8 +164,6 @@

		#define FIX_CREND_SIMPLIFY_CODE /* Ora : simplify line code in crend */
		#define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */
		#define FIX_1113_EXTREND_ISAR /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */
		#define FIX_1113_CLDFB_REND_IN_ISAR /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */

		#define FIX_POINT_HRTF_FILE_FORMAT /* All: fix point hrtf binary file format */
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		@@ -175,7 +173,6 @@
		#define FIX_1123_PARAMBIN_16BIT_ROM /* FhG,Nok: issue 1123: update ParamBin ROM tables and scripts to generate 16 bit tables instead of float */
		#define FIX_RETURN /* VA: fix location of function returns */
		#endif
		#define FIX_BASOP_812_NAN_COHSNR /* FhG: BASOP issue 812: fix nan values in sparse frames for cohSNR value in ITD estimation*/

		/* #################### End BE switches ################################## */

		@@ -183,7 +180,6 @@
		/* any switch which is non-be wrt selection floating point code */
		/* all switches in this category should start with "NONBE_" */

		#define NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE /* VA: issue 1132: prevent division by extremely low energy value in SWB TBE */
		#define NONBE_FIX_1141_OSBA_ROOM_RENDERING /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect */

		/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_binRenderer_internal.c

+2 −39

Original line number	Diff line number	Diff line
		@@ -1171,11 +1171,7 @@ static void ivas_binaural_obtain_DMX(
		set_zero( outImagRightPtr, CLDFB_NO_CHANNELS_MAX );

		/Ambisonics input requires different processing/
		#ifdef FIX_1113_CLDFB_REND_IN_ISAR
		if ( hBinRenderer->nInChannels == HOA3_CHANNELS )
		#else
		if ( hBinRenderer->nInChannels == 16 )
		#endif
		{
		float inRealPtr_W, inImagPtr_W;
		float inRealPtr_Y, inImagPtr_Y;
		@@ -1271,12 +1267,7 @@ ivas_error ivas_rend_openCldfbRend(
		hBinRenderer->conv_band = convBand;
		}

		#ifdef FIX_1113_EXTREND_ISAR
		ivas_output_init( hBinRenderer->hInputSetup, inConfig );
		#else
		hBinRenderer->hInputSetup->is_loudspeaker_setup = 0;
		hBinRenderer->hInputSetup->output_config = inConfig;
		#endif
		if ( ( error = getAudioConfigNumChannels( inConfig, &hBinRenderer->hInputSetup->nchan_out_woLFE ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -1307,8 +1298,6 @@ ivas_error ivas_rend_openCldfbRend(
		return error;
		}

		#ifdef FIX_1113_CLDFB_REND_IN_ISAR
		#ifdef FIX_1113_EXTREND_ISAR
		if ( inConfig == IVAS_AUDIO_CONFIG_FOA )
		{
		pCldfbRend->binaural_latency_ns = (int32_t) ( pCldfbRend->hHrtfFastConv->FASTCONV_FOA_latency_s * 1000000000.f );
		@@ -1326,12 +1315,6 @@ ivas_error ivas_rend_openCldfbRend(
		/* should never happen for SBA */
		return IVAS_ERR_INVALID_OUTPUT_FORMAT;
		}
		#else
		pCldfbRend->binaural_latency_ns = (int32_t) ( pCldfbRend->hHrtfFastConv->FASTCONV_HOA3_latency_s * 1000000000.f );
		#endif
		#else
		pCldfbRend->binaural_latency_ns = (int32_t) ( FASTCONV_HOA3_latency_s * 1000000000.f );
		#endif
		hBinRenderer->hReverb = NULL;
		hBinRenderer->hEFAPdata = NULL;

		@@ -1465,27 +1448,15 @@ ivas_error ivas_binRenderer_open(
		}
		else
		{
		#ifdef FIX_1113_CLDFB_REND_IN_ISAR
		if ( hBinRenderer->nInChannels == HOA3_CHANNELS )
		#else
		if ( hBinRenderer->nInChannels == 16 )
		#endif
		{
		st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_HOA3_latency_s * 1000000000.f );
		}
		#ifdef FIX_1113_CLDFB_REND_IN_ISAR
		else if ( hBinRenderer->nInChannels == HOA2_CHANNELS )
		#else
		else if ( hBinRenderer->nInChannels == 9 )
		#endif
		{
		st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_HOA2_latency_s * 1000000000.f );
		}
		#ifdef FIX_1113_CLDFB_REND_IN_ISAR
		else if ( hBinRenderer->nInChannels == FOA_CHANNELS )
		#else
		else if ( hBinRenderer->nInChannels == 4 )
		#endif
		{
		st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_FOA_latency_s * 1000000000.f );
		}
		@@ -2199,12 +2170,8 @@ void ivas_binRenderer(
		}

		/* HOA decoding to CICP19 if needed*/
		#ifdef FIX_1113_EXTREND_ISAR
		if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 &&
		( hBinRenderer->nInChannels != HOA3_CHANNELS && hBinRenderer->nInChannels != HOA2_CHANNELS && hBinRenderer->nInChannels != FOA_CHANNELS ) )
		#else
		if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 && hBinRenderer->nInChannels != 16 )
		#endif
		{
		ivas_sba2mc_cldfb( *( hBinRenderer->hInputSetup ), RealBuffer, ImagBuffer, hBinRenderer->nInChannels, hBinRenderer->conv_band, numTimeSlots, hBinRenderer->hoa_dec_mtx );
		}
		@@ -2262,11 +2229,7 @@ void ivas_binRenderer(
		}
		else
		{
		#ifdef FIX_1113_EXTREND_ISAR
		rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, Rmat_local, hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, hBinRenderer->hInputSetup->ambisonics_order );
		#else
		rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, Rmat_local, hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, 3 );
		#endif
		}

		ivas_binRenderer_filterModule( Cldfb_RealBuffer_Binaural[pos_idx], Cldfb_ImagBuffer_Binaural[pos_idx], RealBuffer, ImagBuffer, numTimeSlots, hBinRenderer, pos_idx );

lib_dec/swb_tbe_dec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -328,14 +328,12 @@ void wb_tbe_dec(
		prev_pow = sum2_f( shaped_wb_excitation, L_SHB_LAHEAD / 4 );
		curr_pow = sum2_f( shaped_wb_excitation + L_SHB_LAHEAD / 4, L_SHB_LAHEAD / 4 );

		#ifdef NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE
		if ( st->element_mode > EVS_MONO )
		{
		/* prevent too low values of energy */
		prev_pow = max( 0.00001f, prev_pow );
		curr_pow = max( 0.00001f, curr_pow );
		}
		#endif

		if ( voice_factors[0] > 0.75f )
		{
		@@ -1073,14 +1071,12 @@ void swb_tbe_dec(
		prev_pow = sum2_f( shaped_shb_excitation, L_SHB_LAHEAD + 10 );
		curr_pow = sum2_f( shaped_shb_excitation + L_SHB_LAHEAD + 10, L_SHB_LAHEAD + 10 );

		#ifdef NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE
		if ( st->element_mode > EVS_MONO )
		{
		/* prevent too low values of energy */
		prev_pow = max( 0.00001f, prev_pow );
		curr_pow = max( 0.00001f, curr_pow );
		}
		#endif

		if ( voice_factors[0] > 0.75f )
		{