Commit 2023466e authored by vaillancour's avatar vaillancour
Browse files

taking into account mem_decim_fx_q_inp to fix q_inp, solves many saturations... 

taking into account mem_decim_fx_q_inp to fix q_inp, solves many saturations during scaling_sig of 12.8 signals
parent 02a1899f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ 
#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 NONBE_FIX_ISSUE_2206

#define NONBE_FIX_ISSUE_2206_TV1

#define HARM_HQ_CORE                                    /* harmonize HQ core functions */

#define HARM_HQ_CORE_KEEP_BE                            /* hack to keep all BE after HQ core functions harmonization; pending resolving issues #2450, #2451, #2452 */

#define HARMONIZE_TBE3                                  /* VA: basop issue 2399: Remove duplicated code: TBE, step 3 */

lib_enc/ivas_core_pre_proc_front_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -352,6 +352,9 @@ void pre_proc_front_ivas_fx( 
    Q_min = add( sub( 15, st->exp_old_inp_12k8 ), norm_arr( st->old_inp_12k8_fx, L_INP_MEM ) );

    input_frame_full = shl( input_frame, 1 ); //(old frame input length + new frame input length)

    Q_min = s_min( Q_min, sub( add( L_norm_arr( st->input32_fx - input_frame, input_frame_full ), st->q_inp32 ), 16 ) );

#ifdef NONBE_FIX_ISSUE_2206_TV1

    Q_min = s_min( Q_min, norm_arr( st->mem_decim_fx_q_inp, 2 * L_FILT_MAX ) );

#endif

    Q_min = s_max( -2, Q_min );

    Copy_Scale_sig_32_16( st->input32_fx - input_frame, st->input_fx - input_frame, input_frame_full, sub( Q_min, st->q_inp32 ) ); // Q_min

    st->q_inp = Q_min;