Commit 61a87345 authored by Nicolas Roussin's avatar Nicolas Roussin
Browse files

Merge branch 'main' into... 

Merge branch 'main' into basop-2267-cleanup-ivas_dirac_dec_binaural_functions_fx-c-from-be-opt-flags
parents 6592dd4e 449b92ed

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
#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 */

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



/* #################### End BE switches ################################## */
@@ -115,6 +116,7 @@ 
#define FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE  /* VA: Precision improvement without increasing complexity, or complexity reduction that might be not BE on the LSB */

#define FIX_2252_LP_CNG_STARTS_SID                      /* VA: issues 2251 and 2252: fix LP CNG uninitialized value in bitstream that starts with an SID */

#define FIX_1381_BWD                                    /* VA: issue 1381: apply no hysteresis in BWD at higher bitrates also in mono MASA and OMASA */

#define FIX_2285_CODE_DECODER_INIT_BW                   /* VA: basop issue 2285: fix core-decoder initialization bandwidth */



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

lib_dec/init_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ ivas_error init_decoder_fx( 
    }

    ELSE

    {

#if 0 // keep deactivated for the moment to keep BE

#ifdef FIX_2285_CODE_DECODER_INIT_BW

        st_fx->bwidth = WB;

        move16();

        st_fx->last_bwidth = WB;

lib_enc/pitch_ol2_fx.c

+24 −2
Original line number Diff line number Diff line
@@ -50,7 +50,9 @@ 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();
@@ -104,9 +106,14 @@ 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 */
@@ -116,10 +123,18 @@ 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;
@@ -132,13 +147,20 @@ 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;