Merge branch 'main' into orange/no-diegetic-pan-with-radius (7b24b805) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -174,6 +174,8 @@
		#define NO_DIEGETIC_PAN
		#define FIX_CRASH_EVS_BITSTREAM_WITH_OUTPUT
		#define ISM_NO_DIEGETIC_PAN
		#define FIX_376_SBA_ROTATE /DLB: Fix for issue 376/

		/* ################## End DEVELOPMENT switches ######################### */
		/* clang-format on */
		#endif

+12 −0

Original line number	Diff line number	Diff line
		@@ -4388,7 +4388,18 @@ static ivas_error rotateFrameSba(
		( 1 - headRotData->crossfade[i] ) * gains_prev[n][m] * ( *readPtr );
		}
		}
		#ifdef FIX_376_SBA_ROTATE
		/* write back the result */
		for ( n = m1; n < m2; n++ )
		{
		writePtr = getSmplPtr( outAudio, n, subframe_idx * subframe_len + i );
		( *writePtr ) = tmpRot[n - m1];
		}
		m1 = m2;
		m2 += 2 * ( l + 1 ) + 1;
		#endif
		}
		#ifndef FIX_376_SBA_ROTATE
		/* write back the result */
		for ( n = m1; n < m2; n++ )
		{
		@@ -4397,6 +4408,7 @@ static ivas_error rotateFrameSba(
		}
		m1 = m2;
		m2 += 2 * ( l + 1 ) + 1;
		#endif
		}

		/unoptimized code for reference (full matrix multiplication)/