skip initialization of EFAP when IntSetup is HOA3 (has 16 channels) (b6713df4) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+1 −0

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

		#define FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -1275,10 +1275,17 @@ ivas_error ivas_binRenderer_open(
		}

		hBinRenderer->hEFAPdata = NULL;

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