Commit fa50fd2c authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... 

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into 1867-replace-overflow-basop-operators-by-overflow-free-variants-in-lib_enc
parents 7c01e908 235e8e3e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ 
#define NONBE_1360_LFE_DELAY                           /* Dlb: LFE delay alignment when rendering in CLDFB domain*/

#define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */

#define NONBE_SVD_OPTIMIZATION 

#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */



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

lib_rend/ivas_objectRenderer_sfx_fx.c

+7 −2
Original line number Diff line number Diff line
@@ -310,8 +310,13 @@ void TDREND_firfilt_fx( 
    /* Handle memory */

    p_signal_fx = buffer_fx + sub( filterlength, 1 );                        // Qx

    Copy32( mem_fx, buffer_fx, sub( filterlength, 1 ) ); /* Insert memory */ // Qx

#ifdef NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR

    Copy32( signal_fx, p_signal_fx, subframe_length ); /* Insert current frame */                                                              // Qx

    Copy32( p_signal_fx + add( sub( subframe_length, filterlength ), 1 ), mem_fx, sub( filterlength, 1 ) ); /* Update memory for next frame */ // Qx

#else

    Copy32( signal_fx, buffer_fx + sub( filterlength, 1 ), subframe_length ); /* Insert current frame */                                     // Qx

    Copy32( signal_fx + add( sub( subframe_length, filterlength ), 1 ), mem_fx, sub( filterlength, 1 ) ); /* Update memory for next frame */ // Qx

#endif



    /* Convolution */

    FOR( i = 0; i < intp_count; i++ )