Commit 6b37c8bb authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2271_OOB_INDEXING_IN_PIT_OL2

parent 646e8285

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ 
#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_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */

#define FIX_2271_OOB_INDEXING_IN_PIT_OL2                /* VA: Fix for issue 2271, to silence clang18 */

#define FIX_2273_OOB_INDEXING_IN_PIT_FR4                /* VA: Fix to silence clang on ptr init */

#define FIX_1483_PEAQ_VQ_ENC_MSAN_ERROR                 /* Eri: When no PVQ bands are selected in peaq_vq_enc, the number of bands is not initialized. */

#define FIX_1480_CLANG18_MSAN_UNINIT_VARIABLE           /* Eri: Initializes a variables in HQ decoder. It is not used, but is passed uninitialized to a function which is caught by clang-18 */

lib_enc/pitch_ol2_fx.c

+0 −23
Original line number Diff line number Diff line
@@ -50,9 +50,7 @@ void pitch_ol2_fx( 
    Word32 R1, R2;

    Word16 R0, exp_R0, exp_R1, exp_R2, j;

    Word16 pit_max;

#ifdef FIX_2271_OOB_INDEXING_IN_PIT_OL2

    Word16 base_idx;

#endif

    /* initialization */

    pit_max = PIT_MAX;

    move16();
@@ -106,14 +104,9 @@ void pitch_ol2_fx( 
     * search the fractions around t0 and choose the one which maximizes

     * the interpolated normalized correlation.

     *----------------------------------------------------------------*/

#ifndef FIX_2271_OOB_INDEXING_IN_PIT_OL2

    pt_cor_fx = cor_fx + sub( L_INTERPOL1, t0_min );

#endif

    t0s = t1s;

    move16();

#ifdef FIX_2271_OOB_INDEXING_IN_PIT_OL2

    base_idx = sub( L_INTERPOL1, t0_min );

#endif



    step = 1;

    move16(); /* 1/4 subsample resolution */
@@ -123,18 +116,10 @@ void pitch_ol2_fx( 
    IF( NE_16( t0s, t0_min ) ) /* Process negative fractions */

    {

        t0s = sub( t0s, 1 );

#ifndef FIX_2271_OOB_INDEXING_IN_PIT_OL2

        cor_max_fx = Interpol_4( &pt_cor_fx[t0s], fraction );

#else

        cor_max_fx = Interpol_4( &cor_fx[t0s + base_idx], fraction );

#endif

        FOR( i = fraction + step; i <= 3; i += step )

        {

#ifndef FIX_2271_OOB_INDEXING_IN_PIT_OL2

            temp_fx = Interpol_4( &pt_cor_fx[t0s], i );

#else

            temp_fx = Interpol_4( &cor_fx[t0s + base_idx], i );

#endif

            if ( GT_16( temp_fx, cor_max_fx ) )

            {

                fraction = i;
@@ -147,20 +132,12 @@ void pitch_ol2_fx( 
    {

        fraction = 0;

        move16();

#ifndef FIX_2271_OOB_INDEXING_IN_PIT_OL2

        cor_max_fx = Interpol_4( &pt_cor_fx[t0s], fraction );

#else

        cor_max_fx = Interpol_4( &cor_fx[t0s + base_idx], fraction );

#endif

        move16();

    }

    FOR( i = 0; i <= 3; i += step ) /* Process positive fractions */

    {

#ifndef FIX_2271_OOB_INDEXING_IN_PIT_OL2

        temp_fx = Interpol_4( &pt_cor_fx[t1s], i );

#else

        temp_fx = Interpol_4( &cor_fx[t1s + base_idx], i );

#endif

        IF( GT_16( temp_fx, cor_max_fx ) )

        {

            cor_max_fx = temp_fx;