Commit 5c5db539 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_BASOP_2560_STEREO_DFT_DEC_RESET

parent cd7b676e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_BASOP_2560_STEREO_DFT_DEC_RESET             /* FhG: BASOP issue 2560: align reset of hStereoDft->res_gains_ind_fx[][] between BASOP and float */

#define HARMONIZE_2539_cng_energy                       /* FhG: basop issue 2539: harmonize cng_energy with its ivas derivate */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA,FhG: float issues 1585,1593: alternative fix memory leaks with format switching */

#define FIX_BASOP_2573_RF_MODE_UPDATE                   /* FhG: BASOP issue 2573: remove duplicated update of rf_mode parameters from evs_enc_fx(); was already done in updt_enc_common_fx() */

lib_dec/ivas_stereo_dft_dec_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -115,21 +115,13 @@ void stereo_dft_dec_reset_fx( 


    set16_fx( hStereoDft->res_pred_index_previous, 0, STEREO_DFT_BAND_MAX );



#ifdef FIX_BASOP_2560_STEREO_DFT_DEC_RESET

    FOR( i = 0; i < STEREO_DFT_BAND_MAX; i++ )

#else

    FOR( i = 0; i < STEREO_DFT_BAND_MAX * 2; i++ )

#endif

    {

        hStereoDft->res_gains_ind_fx[0][i] = 1006632960; /* 15.0f in Q26 */

        move32();

    }



#ifdef FIX_BASOP_2560_STEREO_DFT_DEC_RESET

    set32_fx( hStereoDft->res_gains_ind_fx[1], 0, STEREO_DFT_BAND_MAX );

#else

    set32_fx( hStereoDft->res_gains_ind_fx[1], 0, STEREO_DFT_BAND_MAX * 2 );

#endif



    /*residual coding*/

    set16_fx( hStereoDft->res_cod_mode, hStereoDft->hConfig->res_cod_mode, STEREO_DFT_DEC_DFT_NB );