Commit 07780a73 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2274_OOB_INDEXING_IN_CORRMATRIX

parent 5b149758
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@
#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK       /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */
#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */
#define FIX_2274_OOB_INDEXING_IN_CORRMATRIX             /* FhG: fix OOB indexing complaint */
#define FIX_2278_OOB_INDEXING_IN_CLOSED_LOOP_PIT_SEARCH /* FhG: fix oob indexing USAN complaint */
#define FIX_2287_MCT_MDCT_STEREO_DATA_MALLOC_SIZE       /* FhG: correct allocation size for STEREO_MDCT_DEC_DATA struct */
#define FIX_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */
+0 −4
Original line number Diff line number Diff line
@@ -997,14 +997,10 @@ void E_ACELP_corrmatrix_fx(
        p3 = &rrixiy[2][pos]; /* Q9 */
        p2 = &rrixiy[1][pos];
        p1 = &rrixiy[0][pos];
#ifdef FIX_2274_OOB_INDEXING_IN_CORRMATRIX
        p0 = &rrixiy[3][pos];
        /* decrement pointer instead of indexing the array to avoid CLANG Usan complaint */
        /* for last loop iteration, this points to rrixiy[3][-1], but is not actually accessed in later loop (k = 15 then, so inner loop will not run) */
        p0 -= 16;
#else
        p0 = &rrixiy[3][pos - 16];
#endif

        cor = L_deposit_h( 0 );
        ptr_h1 = h;      /*Q12*/