Commit 3728c466 authored by multrus's avatar multrus
Browse files

[cleanup] accept HARM_HQ_CORE_KEEP_BE

parent a8ff39cd

lib_com/low_rate_band_att_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -101,12 +101,10 @@ void fine_gain_pred_fx( 
                    ELSE

                    {

                        tmp1 = fine_gain_pred_sqrt_bw[bw_idx];

#ifdef HARM_HQ_CORE_KEEP_BE

                        if ( EQ_16( bw_idx, 0 ) )

                        {

                            tmp1--; /* Lookup table uses rounding while calculations use truncation */

                        }

#endif

                    }

                }

#endif

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ 
#define NONBE_FIX_ISSUE_2206_TD_CHANNEL_EXTRAPOLATION   /* FhG: Use different scale to avoid saturation of LPC coefficient in TD Stereo signal extrapolation. */

#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 HARM_HQ_CORE_KEEP_BE                            /* hack to keep all BE after HQ core functions harmonization; pending resolving issues #2450, #2451, #2452 */

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

#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() */

lib_enc/hq_lr_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -209,11 +209,7 @@ void hq_lr_enc_fx( 
#ifdef FIX_2452_HQ_CORE_PEAQ_AVR_RATIO_HARM

            hqswb_clas_fx = peak_avrg_ratio_fx( st_fx->total_brate, L_t_audio, NUMC_N, &hHQ_core->mode_count, &hHQ_core->mode_count1, SWB_BWE_LR_Qs ); /* Q0 */

#else

#ifdef HARM_HQ_CORE_KEEP_BE

            hqswb_clas_fx = peak_avrg_ratio_fx( HQ_BWE_CROSSOVER_BRATE, L_t_audio, NUMC_N, &hHQ_core->mode_count, &hHQ_core->mode_count1, SWB_BWE_LR_Qs ); /* Q0 */

#else

            hqswb_clas_fx = peak_avrg_ratio_fx( st_fx->total_brate, L_t_audio, NUMC_N, &hHQ_core->mode_count, &hHQ_core->mode_count1, SWB_BWE_LR_Qs ); /* Q0 */

#endif

#endif

        }