Commit 37254efa authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1461_CNG_BW_SWITCHING

parent 87c20f21

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ 
/* #################### Start NON-BE switches ############################ */

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



#define FIX_1461_CNG_BW_SWITCHING                       /* Eri: issue 1461: Stereo parameters are not updated when SID/NODATA forces BW to stay the same */

#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 */

lib_enc/ivas_cpe_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -112,9 +112,7 @@ ivas_error ivas_cpe_enc( 
    int32_t cpe_brate;

    int32_t element_brate_ref;

    int16_t last_bits_frame_nominal; /* last_bits_frame_nominal for M or PCh channel */

#ifdef FIX_1461_CNG_BW_SWITCHING

    int16_t NFFT_inner;

#endif



    error = IVAS_ERR_OK;

    push_wmops( "ivas_cpe_enc" );
@@ -631,11 +629,9 @@ ivas_error ivas_cpe_enc( 
            if ( sts[0]->core_brate == SID_2k40 || sts[0]->core_brate == FRAME_NO_DATA )

            {

                /* Reconfigure DFT Stereo for inactive frames */

#ifdef FIX_1461_CNG_BW_SWITCHING

                /* -- nbands may need to be updated here in case the bandwidth was changed due to inactive frames */

                NFFT_inner = STEREO_DFT_N_MAX_ENC * inner_frame_tbl[sts[0]->bwidth] / L_FRAME48k;

                hCPE->hStereoDft->nbands = stereo_dft_band_config( hCPE->hStereoDft->band_limits, hCPE->hStereoDft->hConfig->band_res, NFFT_inner, ENC );

#endif

                if ( sts[0]->core_brate == SID_2k40 )

                {

                    stereo_dft_config( hConfigDft, IVAS_SID_5k2, &sts[0]->bits_frame_nominal, &sts[1]->bits_frame_nominal );

lib_enc/ivas_stereo_dft_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -2879,14 +2879,12 @@ static void stereo_dft_enc_compute_prm( 


    hStereoDft->nrg_past_pos = ( pos + 1 ) % STEREO_DFT_NRG_PAST_LEN;



#ifdef FIX_1461_CNG_BW_SWITCHING

    /* Replicate last band for remaining bands in case the bandwidth is higher after SID/NODATA is considered */

    for ( i = hStereoDft->nbands; i < STEREO_DFT_BAND_MAX; i++ )

    {

        pPredGain[i] = pPredGain[i - 1];

        pSideGain[i] = pSideGain[i - 1];

    }

#endif



#ifdef DEBUG_MODE_DFT

    {