Commit 27d220cd authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2252_SCALING_SAVE_HB_SYNTH

parent 14e7c538

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ 
#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK       /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_2252_SCALING_SAVE_HB_SYNTH                  /* VA: issue 2252: fix use-of-uninit-value in save_hb_synth_fx[] scaling in FOA decoding with bitstream that starts with an SID */

#define FIX_2248_EVS_ASSERT                             /* VA: Include _sat in an EVS related part of the code */

#define FIX_2254_IMPROV_COMPLEXITY_BE                   /* VA: BE small complexity reduction  */

#define FIX_2275_OOB_INDEXING_IN_PREDICT_SIGNAL_FUNC    /* FhG: fix a USAN OOB error */

lib_dec/acelp_core_dec_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -2337,17 +2337,9 @@ ivas_error acelp_core_dec_fx( 


    IF( NE_16( st->element_mode, EVS_MONO ) )

    {

#ifdef FIX_2252_SCALING_SAVE_HB_SYNTH

        IF( save_hb_synth_fx16 != NULL )

#else

        IF( save_hb_synth_fx16 )

#endif

        {

#ifdef FIX_2252_SCALING_SAVE_HB_SYNTH

            Copy_Scale_sig_32_16( save_hb_synth_fx, save_hb_synth_fx16, output_frame, 0 ); // Q0

#else

            Copy_Scale_sig_32_16( save_hb_synth_fx, save_hb_synth_fx16, L_FRAME48k, 0 ); // Q0

#endif

        }

        Copy_Scale_sig_32_16( synth_fx, synth_fx16, output_frame, 0 ); // Q_syn2

    }