Commit 689a8e68 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT

parent c7156d5b

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
#define FIX_2255_ISAR_RENDER_POSES                      /* VA: issue 2255: fix missing check in isar_render_poses() */

#define FIX_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */

#define FIX_1478_UNINIT_ON_BFI                          /* VA: Fix issue 1478 where a vector is partly un-initialized during bfi */

#define FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT             /* Nokia/FhG: basop issue 2323: Use correct init size */

#define FIX_BASOP_2324_MISSING_SET_TO_ZERO              /* Nokia: basop issue 2324: Fix issue by setting the exponent to zero where it should be */

#define FIX_BASOP_2326_WRONG_SIG_LENGTH                 /* Nokia: basop issue 2326: Fix issue by using correct signal length in multiple places */

#define FIX_BASOP_2327_WRONG_LOOP_END                   /* Nokia: basop inssue 2327: Correct loop end to solve MSAN error */

lib_enc/ivas_dirac_enc_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -1574,17 +1574,9 @@ void computeDiffuseness_mdft_fx( 
    set_zero_fx( intensity_slow, i_mult( DIRAC_NUM_DIMS, MASA_FREQUENCY_BANDS ) );

    set16_fx( intensity_slow_e, 0, i_mult( DIRAC_NUM_DIMS, MASA_FREQUENCY_BANDS ) );

    set_zero_fx( intensity_slow_abs, MASA_FREQUENCY_BANDS );

#ifdef FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT

    set16_fx( intensity_slow_abs_e, 0, MASA_FREQUENCY_BANDS );

#else

    set16_fx( intensity_slow_abs_e, 0, no_col_avg_diff );

#endif

    set_zero_fx( energy_slow, MASA_FREQUENCY_BANDS );

#ifdef FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT

    set16_fx( energy_slow_e, 0, MASA_FREQUENCY_BANDS );

#else

    set16_fx( energy_slow_e, 0, no_col_avg_diff );

#endif



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

    {