Commit 17f591ae authored by multrus's avatar multrus
Browse files

Merge branch '20260204_cleanup' into 'main' 

20260204 cleanup

See merge request !2515
parents 21485f9a d302f719

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -162,15 +162,12 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#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_2371_REMOVE_UNUSED_ISAR_FCNS                /* Dolby: basop issue 2371: remove unused ISAR-related functions */      



/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.258 V3.0 */

#define FIX_1465_SWB_TBE_RANDOM_VECTOR_CREATION         /* Dolby: issue 1465: Fix constant in create_random_vector() to allow more reliable fixed point port */

#define FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG       /* Eri: Basop issue 2317: Uninitialized value read in case of DTX and BW switching   */

#define FIX_1283_STEREO_DFT_COLLAPSE                    /* FhG: issue 1283: fix for critical issue with DFT stereo core coder */

#define FIX_BASOP_2396_CONSTANT_STRIDE_IN_TC_BUFFER     /* FhG/VA: basop issue 2396: keep TC channel pointers in one constant place during decoding and rendering */

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

lib_enc/cod_tcx.c

+1 −9
Original line number Diff line number Diff line
@@ -728,11 +728,7 @@ void ShapeSpectrum( 
        hTcxCfg->SFM2 = SFM_Cal( spectrum, min( 200, L_frame ) );

    }



#ifndef FIX_1283_STEREO_DFT_COLLAPSE

    if ( ( total_brate <= ACELP_13k20 && st->bwidth == SWB ) )

#else

    if ( ( total_brate <= ACELP_13k20 || ( st->element_brate <= IVAS_16k4 && st->element_mode == IVAS_CPE_DFT ) ) && st->bwidth == SWB )

#endif

    {

        max_low_pre = 0.f;

        for ( i = 0; i < L_frame; i++ )
@@ -777,11 +773,7 @@ void ShapeSpectrum( 
    }



    /* reduce the peaks in the IGF region, to make life of the core-coder easier... */

#ifndef FIX_1283_STEREO_DFT_COLLAPSE

    if ( total_brate <= ACELP_13k20 && st->bwidth == SWB )

#else

    if ( ( total_brate <= ACELP_13k20 || ( st->element_brate <= IVAS_16k4 && st->element_mode == IVAS_CPE_DFT ) ) && st->bwidth == SWB )

#endif

    {

        int16_t dist_low, dist_high;

        float max_fac;

lib_enc/ivas_sce_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -361,9 +361,7 @@ ivas_error create_sce_enc( 
    }



    st->total_brate = hSCE->element_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */

#ifdef FIX_1283_STEREO_DFT_COLLAPSE

    st->element_brate = -1;

#endif

    st->mct_chan_mode = MCT_CHAN_MODE_REGULAR;



    if ( ( error = init_encoder( st, st_ivas, 0, 0, st_ivas->ism_mode, hSCE->element_brate ) ) != IVAS_ERR_OK )

lib_enc/ivas_stereo_dft_enc.c

+0 −5
Original line number Diff line number Diff line
@@ -2980,14 +2980,9 @@ static void stereo_dft_enc_compute_prm( 
    /*------------------------------------------------------------------*

     * Compute Side gains

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

#ifdef FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG

    mvr2r( pSideGain, hStereoDft->sidSideGain, STEREO_DFT_BAND_MAX ); /* Copy all sideGain values since BW change may be reverted during CNG */

#endif

    for ( b = 0; b < hStereoDft->nbands; b++ )

    {

#ifndef FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG

        hStereoDft->sidSideGain[b] = *( pSideGain + b );

#endif

        /* Quantization */

        if ( flag_quant )

        {

lib_isar/isar_PredDecoder.c

+0 −22
Original line number Diff line number Diff line
@@ -342,28 +342,6 @@ int16_t ReadPredictors( 
    return iBitsRead;

}



#ifndef FIX_2371_REMOVE_UNUSED_ISAR_FCNS

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

 * Function SetDecodingPassed()

 *

 *

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



void SetDecodingPassed(

    PredictionDecoder *psPredictionDecoder )

{

    int32_t n, ch;

    for ( ch = 0; ch < psPredictionDecoder->iChannels; ch++ )

    {

        for ( n = 0; n < psPredictionDecoder->iNumSubSets; n++ )

        {

            psPredictionDecoder->ppiDecodingFailed[ch][n] = 0;

        }

    }



    return;

}

#endif



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

 * Function AnyDecodingUnresolved()