Commit 0f592207 authored by multrus's avatar multrus
Browse files

Merge branch... 

Merge branch 'basop-2560-stereo_dft_dec_reset-mismatch-between-float-and-basop-for-resetting-hstereodft' into 'main'

Resolve "stereo_dft_dec_reset() Mismatch between float and BASOP for resetting hStereoDft->res_gains_ind[][]"

Closes #2560

See merge request !2990
parents e96b19c8 f12305a6

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 
#define FIX_BASOP_2095_REMOVE_TABLES_PT01               /* FhG: BASOP issue 2095: remove unused tables, part 01 */

#define FIX_2346_DUPLICATED_IGF_FUNCTIONS_2             /* FhG: part 2 of basop issue 2346: Review potentially duplicated IGF functions */

#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */

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



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

lib_dec/ivas_stereo_dft_dec_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -115,13 +115,21 @@ 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 );