Commit 41b2da0f authored by vaclav's avatar vaclav
Browse files

[cleaning] issue 74: remove redundant function call in ivas_cpe_enc(); under FIX_I74_CLEANING

parent a579bfe2

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ 


#define DIRAC_DRCT_GAIN_TUNING                          /* issue 64: tuning of DirAC energy-compensation gains */



/*#define FIX_I74_BW_LIMITATION*/                           /* Propagate bitrate induced BW limitation to hEncoderConfig. Ensures BE between explicit BW limitation using "-max_band <BW>" and BW limited by bitrate */



/*#define FIX_I74_BW_LIMITATION*/                       /* issue 74: Propagate bitrate induced BW limitation to hEncoderConfig. Ensures BE between explicit BW limitation using "-max_band <BW>" and BW limited by bitrate */

#define FIX_I74_CLEANING                                /* issue 74: remove redundant function call in ivas_cpe_enc() */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_enc/ivas_cpe_enc.c

+2 −0
Original line number Diff line number Diff line
@@ -343,11 +343,13 @@ ivas_error ivas_cpe_enc( 


        sts[0]->total_brate = ( sts[0]->bits_frame_nominal + 10 ) * FRAMES_PER_SEC; /* add small overhead; st[0]->total_brate used in coder_type_modif() */



#ifndef FIX_I74_CLEANING

        if ( ( sts[0]->last_bwidth < max_bwidth ) || ( sts[0]->last_core_brate <= SID_2k40 ) ) /* IVAS_fmToDo: TBV - BWD output is not known here yet !!! */

        {

            /* reconfigure in case of BW switching or if last frame was a SID/NO_DATA with coarse partitioning */

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

        }

#endif



        /* Update DFT Stereo memories */

        stereo_dft_enc_update( hCPE->hStereoDft, sts[0]->max_bwidth