Commit 8b5a1a24 authored by norvell's avatar norvell
Browse files

Merge branch '1176-asan-stack-buffer-underflow-in-osba-with-binaural_room_rverb-output' into 'main' 

[Non BE] Handle subframes shorter than filter length in TD renderer for JBM operation

See merge request !1808
parents 299c9e92 712bea2d

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ 




#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

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



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

lib_rend/ivas_objectRenderer_sfx.c

+6 −1
Original line number Diff line number Diff line
@@ -261,8 +261,13 @@ void TDREND_firfilt( 
    /* Handle memory */

    p_signal = buffer + filterlength - 1;

    mvr2r( mem, buffer, filterlength - 1 ); /* Insert memory */

#ifdef NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR

    mvr2r( signal, p_signal, subframe_length );                                    /* Insert current frame */

    mvr2r( p_signal + subframe_length - filterlength + 1, mem, filterlength - 1 ); /* Update memory for next frame */

#else

    mvr2r( signal, buffer + filterlength - 1, subframe_length );                 /* Insert current frame */

    mvr2r( signal + subframe_length - filterlength + 1, mem, filterlength - 1 ); /* Update memory for next frame */

#endif



    /* Convolution */

    for ( i = 0; i < subframe_length; i++ )