Commit e5c618d7 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch... 

Merge branch '974-usan-index-out-of-bounds-in-osba-jbm-decoding-to-mono-and-stereo-with-rate-switching' into 'main'

[Non-BE] Resolve "USAN: index out of bounds in OSBA JBM decoding to mono and stereo with rate switching"

See merge request !1354
parents a5a99bdf c9ce35b8

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN                   /* FhG : issue #974: usan in mono and stereo output in OSBA JBM RS */

#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES             /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers */

#define NONBE_FIX_973_HODIRAC_BAND_GROUPING                   /* FhG: issue 973: empty parameter band in DirAC */

#define NONBE_FIX_951_MCMASA_5MS_RENDERING                    /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2 kbps to BINAURAL */

lib_dec/ivas_sba_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -254,7 +254,11 @@ ivas_error ivas_sba_dec_reconfigure( 
    }



    /* save old */

#ifdef NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN

    if ( ism_mode_old != ISM_SBA_MODE_DISC && st_ivas->hTcBuffer->tc_buffer_mode != TC_BUFFER_MODE_BUFFER )

#else

    if ( ism_mode_old != ISM_SBA_MODE_DISC )

#endif

    {

        if ( st_ivas->hDirAC == NULL && st_ivas->hSpar != NULL )

        {