Commit a4a10562 authored Nov 05, 2025 by multrus

Merge branch '2139-edited-object-gains-not-evaluated-in-the-ism-gain-calculation' into 'main'

[non-BE][allow regression] Resolve "Edited object gains not evaluated in the ISM gain calculation"

Closes #2139

See merge request !2435

parents b999fc6a 094d7149

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -144,6 +144,7 @@
		#define FIX_1372_OSBA_OBJECT_EDITING /* VA: issue 1372: Fix OSBA object-editing in BINAURAL_ROOM_IR */
		#define FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES /* Nokia: Issue 2140, fixes three different sanitizer issues persisting in object editing code. */
		#define NONBE_FIX_1172_OBJ_EDIT_JBM /* VA: issue 1172: fix OMASA object editing in JBM */
		#define FIX_2193_ISM_GAINS_WITH_OE /* FhG: fix issue 2193: use edited angles in ISM gain calculation */

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

lib_dec/ivas_ism_param_dec_fx.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -1069,8 +1069,13 @@ void ivas_ism_dec_digest_tc_fx(
		EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) )
		{
		/get HOA gets for direction (ACN/SN3D)/
		#ifdef FIX_2193_ISM_GAINS_WITH_OE
		Word16 azi = round_fx( L_shr( st_ivas->hIsmMetaData[i]->edited_azimuth_fx, Q22 - Q16 ) ); // Q0
		Word16 ele = round_fx( L_shr( st_ivas->hIsmMetaData[i]->edited_elevation_fx, Q22 - Q16 ) ); // Q0
		#else
		Word16 azi = shr( extract_h( st_ivas->hIsmMetaData[i]->azimuth_fx ), 22 - 16 ); // Q0
		Word16 ele = shr( extract_h( st_ivas->hIsmMetaData[i]->elevation_fx ), 22 - 16 ); // Q0
		#endif

		ivas_dirac_dec_get_response_fx( azi, ele, st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIntSetup.ambisonics_order, Q30 );