Commit 047daf99 authored by multrus's avatar multrus
Browse files

Merge branch 'main' into basop-2491-decoding-MDCT-stereo-64-kbps-with-JBM-introduces-click

parents 4150d2f0 41d59e73

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 
#define FIX_2480_HARM_TONALMDCT                         /* FhG: basop issue 2480: Harmonize TonalMDCTConceal_Detect_fx() and TonalMDCTConceal_Detect_ivas_fx() */

#define FIX_2479_HARM_PITCH_GAIN                        /* FhG: basop issue 2479: Harmonize tcx_ltp_pitch_search_*(), tcx_ltp_find_gain_*fx() */

#define HARMONIZE_2481_EXTEND_SHRINK                    /* FhG: basop issue 2481: Harmonize extend_frm_*fx() and shrink_frm_*fx() */

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



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

lib_enc/swb_bwe_enc_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -217,7 +217,9 @@ 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 )

    {
@@ -268,7 +270,9 @@ 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 );
@@ -296,7 +300,9 @@ 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 );