Commit 8ecac39c authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_395_CNG_BW

parent 3c9925d9

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ 






#define FIX_395_CNG_BW                                  /* Eri: Issue 395 - CNG bandwidth issue for unified stereo */



#define EXTERNAL_ORIENTATIONS                           /* Nokia: Contribution 41: (external) orientation information handling */

#define FIX_541_EXT_REND_MASA_ROTATIONS                 /* Nokia: Issue 541, rotations missing in masa external renderer */

lib_enc/ivas_cpe_enc.c

+0 −3
Original line number Diff line number Diff line
@@ -580,9 +580,6 @@ ivas_error ivas_cpe_enc( 
                stereo_dft_cng_side_gain( hCPE->hStereoDft, hCPE->hStereoCng, sts[0]->core_brate, sts[0]->last_core_brate, sts[0]->bwidth );

#ifdef DEBUG_MODE_DFT

                hCPE->hStereoDft->res_cod_bits = 0;

#endif

#ifndef FIX_395_CNG_BW

                stereo_dft_enc_update( hCPE->hStereoDft, min( SWB, sts[0]->max_bwidth ) );

#endif

            }

            else

lib_enc/ivas_stereo_dft_enc.c

+0 −10
Original line number Diff line number Diff line
@@ -2163,7 +2163,6 @@ void stereo_dft_enc_write_BS( 


    nbands_full = hStereoDft->nbands;



#ifdef FIX_395_CNG_BW

    if ( core_brate == FRAME_NO_DATA || core_brate == SID_2k40 )

    {

        NFFT_inner = min( STEREO_DFT_N_32k_ENC, STEREO_DFT_N_MAX_ENC * inner_frame_tbl[hCPE->hCoreCoder[0]->bwidth] / L_FRAME48k );
@@ -2178,15 +2177,6 @@ void stereo_dft_enc_write_BS( 


    /* set number of bands according to bandwidth after BWD */

    hStereoDft->nbands = stereo_dft_band_config( hStereoDft->band_limits, hStereoDft->band_res[k_offset], NFFT_inner, ENC );

#else

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



    if ( !( core_brate == SID_2k40 || core_brate == FRAME_NO_DATA ) )

    {

        /* set number of bands according to bandwidth after BWD */

        hStereoDft->nbands = stereo_dft_band_config( hStereoDft->band_limits, hStereoDft->band_res[k_offset], NFFT_inner, ENC );

    }

#endif



    if ( core_brate == FRAME_NO_DATA )

    {