Commit 9e5e915b authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch... 

Merge branch '376-bug-in-rotateframesba-while-writing-the-rotated-output-to-output-buffer' into 'main'

[rend-non-BE][non-BE] Fix for issue 376

See merge request !500
parents d76c2a49 7e925d3f

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -170,6 +170,8 @@ 
#define FIX_350_MASA_DELAY_COMP                         /* Nokia: Issue 350: MASA audio/meta delay compensation */

#define FIX_372_LIB_REND_VALIDATE_IO                    /* FhG: Issue 372: IVAS_rend segfaults with unsupported I/O configs - add validation checks of I/O config */



#define FIX_376_SBA_ROTATE                             /*DLB: Fix for issue 376*/



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

#endif

lib_rend/lib_rend.c

+12 −0
Original line number Diff line number Diff line
@@ -4321,7 +4321,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++ )

            {
@@ -4330,6 +4341,7 @@ static ivas_error rotateFrameSba( 
            }

            m1 = m2;

            m2 += 2 * ( l + 1 ) + 1;

#endif

        }



        /*unoptimized code for reference (full matrix multiplication)*/