Commit 4d927001 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_FLOAT_ISSUE_1546_DEAD_CODE

parent c6b28724

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_SWB_fenv_fx2 /* FhG: Avoid overflow of SWB_fenv_fx in SWB_BWE_encoding_fx because of very small energies. */

#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define FIX_2452_HQ_CORE_PEAQ_AVR_RATIO_HARM            /* Eri: Basop issue 2453: Fix alignment of peak_avrg_ratio_fx */

#define FIX_FLOAT_ISSUE_1546_DEAD_CODE                  /* FhG: remove dead code reported in the issue*/

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

#define OPTIMIZE_FFT_STACK                              /* VA: removal of intermediate FFT buffers */

#define HARMONIZE_DCT                                   /* VA: removal of duplicated DCT functions */

lib_enc/swb_bwe_enc_fx.c

+0 −9
Original line number Diff line number Diff line
@@ -243,9 +243,6 @@ void swb_bwe_enc_fx( 
    Word16 Qenc_synth_hf, Qenc_synth;



    FD_BWE_ENC_HANDLE hBWE_FD = st_fx->hBWE_FD;

#ifndef FIX_FLOAT_ISSUE_1546_DEAD_CODE

    TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;

#endif



    IF( st_fx->element_mode == EVS_MONO )

    {
@@ -307,9 +304,6 @@ void swb_bwe_enc_fx( 
            IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) )

            {

                Copy( old_input_12k8_fx + L_INP_MEM - Sample_Delay_LP, hBWE_FD->old_input_lp_fx, Sample_Delay_LP );

#ifndef FIX_FLOAT_ISSUE_1546_DEAD_CODE

                Copy( hBWE_TD->old_speech_shb_fx + L_LOOK_16k + L_SUBFR16k - Sample_Delay_HP, new_input_hp_fx, Sample_Delay_HP );

#endif

            }

            Copy( hBWE_FD->old_input_lp_fx, old_input_lp_fx, Sample_Delay_LP );

            Copy( old_input_12k8_fx + L_INP_MEM, &old_input_lp_fx[Sample_Delay_LP], L_FRAME - Sample_Delay_LP );
@@ -337,9 +331,6 @@ void swb_bwe_enc_fx( 
            IF( EQ_16( st_fx->element_mode, IVAS_CPE_DFT ) )

            {

                Copy( old_input_16k_fx + L_INP_MEM - Sample_Delay_LP, hBWE_FD->old_input_lp_fx, Sample_Delay_LP );

#ifndef FIX_FLOAT_ISSUE_1546_DEAD_CODE

                Copy( hBWE_TD->old_speech_shb_fx + L_LOOK_16k + L_SUBFR16k - Sample_Delay_HP, new_input_hp_fx, Sample_Delay_HP );

#endif

            }



            Copy( hBWE_FD->old_input_lp_fx, old_input_lp_fx, Sample_Delay_LP );