port float MR 1496 out of line to fix tests (a31a4496) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,7 @@
		#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 ############################ */

+16 −4

Original line number	Diff line number	Diff line
		@@ -1524,6 +1524,10 @@ ivas_error ivas_binRenderer_open_fx(
		}

		/* initialize the dmx matrix */
		#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
		IF( NE_16( hBinRenderer->nInChannels, HOA3_CHANNELS ) )
		{
		#endif
		FOR( chIdx = 0; chIdx < BINAURAL_CHANNELS; chIdx++ )
		{
		FOR( k = 0; k < hBinRenderer->nInChannels; k++ )
		@@ -1532,6 +1536,9 @@ ivas_error ivas_binRenderer_open_fx(
		move32();
		}
		}
		#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
		}
		#endif
		}
		ELSE
		{
		@@ -1540,10 +1547,15 @@ ivas_error ivas_binRenderer_open_fx(

		hBinRenderer->hEFAPdata = NULL;

		#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
		IF( hBinRenderer->hReverb != NULL && NE_16( hBinRenderer->nInChannels, HOA3_CHANNELS ) )
		#else
		IF( hBinRenderer->hReverb != NULL )
		#endif
		{
		test();
		test();
		/* NOTE to future self by @kiene: this should have been changed by NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM, but the BASOP repo code is not at that point yet, so not change needed here */
		IF( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 )
		{
		FOR( k = 0; k < 11; k++ )