Commit 537159ea authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_ISSUE_2206

parent 8e8b913a

lib_com/ivas_prot_fx.h

+0 −10
Original line number Diff line number Diff line
@@ -1173,12 +1173,8 @@ void stereo_dft_dec_fx( 


Word32 stereo_dft_enc_synthesize_fx(

    STEREO_DFT_ENC_DATA_HANDLE hStereoDft,                      /* i/o: encoder stereo handle               */

#ifdef NONBE_FIX_ISSUE_2206

    Word32 *output_fx,                                          /* i/o  : output synthesis         q_output */

    Word16 *q_output,                                           /* i/o  : output synthesis               Q0 */

#else

    Word32 *output_fx,                                          /* o  : output synthesis                Q16 */

#endif

    Word16 *output_start_index,

    Word16 *output_end_index,

    const Word16 chan,                                          /* i  : channel number                      */
@@ -2673,9 +2669,7 @@ Word16 ivas_acelp_tcx20_switching_fx( 
    Word16 *inp_fx,                                             /* i  : new input signal                        */

    Word16 q_inp,                                               /* i  : i/p Q                                   */

    Word16 *wsp,                                                /* i  : input weighted signal                   */

#ifdef NONBE_FIX_ISSUE_2206

    Word16 q_wsp,                                               /* i  : Q of input weighted signal                   */

#endif

    Word32 non_staX,                                            /* i  : unbound non-stationarity for sp/mu clas */

    Word16 *pitch_fr,                                           /* i  : fraction pitch values                   */

    Word16 *voicing_fr,                                         /* i  : fractional voicing values               */
@@ -5707,12 +5701,8 @@ void pre_proc_ivas_fx( 
    Word16 *epsP_fx_q,                                          /* i  : LP prediction errors                                   */

    Word16 lsp_new_fx[M],                                       /* i/o: LSPs at the end of the frame                        Q15*/

    Word16 lsp_mid_fx[M],                                       /* i/o: LSPs in the middle of the frame                     Q15*/

#ifdef NONBE_FIX_ISSUE_2206

    Word16 *new_inp_resamp16k_fx,                               /* o  : new input signal @16kHz, non pre-emphasised, used by the WB TBE/BWE    q_new_inp_resamp16k_fx*/

    Word16 *q_new_inp_resamp16k_fx,                             /* o  : Q value of new input signal @16kHz, non pre-emphasised, used by the WB TBE/BWE */

#else

    Word16 *new_inp_resamp16k_fx,                               /* o  : new input signal @16kHz, non pre-emphasised, used by the WB TBE/BWE    Q_new-1*/

#endif

    Word16 *Voicing_flag,                                       /* o  : voicing flag for HQ FEC                              Q0*/

    Word16 old_wsp_fx[],                                        /* i  : weighted input signal buffer                  e_old_wsp*/

    const Word16 e_old_wsp,                                     /* i  : Q value of weighted input signal buffer                */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ 
#define FIX_1990_SANITIZER_IN_REVERB_LOAD               /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#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                            /* FhG: Calculate st->q_inp and Q_new dynamically for all data paths instead of assuming constant values */

#define NONBE_FIX_ISSUE_2206_TV1                        /* VA/FhG: Calculate st->q_inp also considering st->mem_q decimation memory to avoid saturation */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT             /* FhG: Dynamic scale of shb_speech buffers */

#define NONBE_FIX_ISSUE_2206_TD_CHANNEL_EXTRAPOLATION   /* FhG: Use different scale to avoid saturation of LPC coefficient in TD Stereo signal extrapolation. */

lib_com/prot_fx.h

+0 −8
Original line number Diff line number Diff line
@@ -3991,11 +3991,7 @@ Word16 find_guarded_bits_fx( const Word32 n ); 


Word16 L_norm_arr( const Word32 *arr, Word16 size );

Word16 L_norm_arr_cmplx( const cmplx *arr, Word16 size );

#ifdef NONBE_FIX_ISSUE_2206

Word16 norm_arr( const Word16 *arr, Word16 size );

#else

Word16 norm_arr( Word16 *arr, Word16 size );

#endif

Word16 W_norm_arr( Word64 *arr, Word16 size );



Word16 get_min_scalefactor( Word32 x, Word32 y );
@@ -8537,14 +8533,12 @@ void Copy_Scale_sig( 
    const Word16 exp0 /* i  : exponent: x = round(x << exp)   Qx ?exp  */

);



#ifdef NONBE_FIX_ISSUE_2206

void Copy_Scale_sig_nosat(

    const Word16 x[], /* i  : signal to scale i             Qx        */

    Word16 y[],       /* o  : scaled signal output            Qx        */

    const Word16 lg,  /* i  : size of x[]                     Q0        */

    const Word16 exp0 /* i  : exponent: x = round(x << exp)   Qx ?exp  */

);

#endif



void Scale_sig32(

    Word32 x[],       /* i/o: signal to scale                 Qx        */
@@ -8580,14 +8574,12 @@ void Copy_Scale_sig_32_16( 
    const Word16 exp0 /* i  : exponent: x = round(x << exp)   Qx ?exp  */

);



#ifdef NONBE_FIX_ISSUE_2206

void Copy_Scale_sig_32_16_nosat(

    const Word32 x[], /* i  : signal to scale input           Qx        */

    Word16 y[],       /* o  : scaled signal output            Qx        */

    const Word16 lg,  /* i  : size of x[]                     Q0        */

    const Word16 exp0 /* i  : exponent: x = round(x << exp)   Qx ?exp  */

);

#endif



void Random_Fill(

    Word16 *seed,  /* i/o: random seed         */

lib_com/tools_fx.c

+0 −10
Original line number Diff line number Diff line
@@ -1249,7 +1249,6 @@ void Copy_Scale_sig( 
    return;

}



#ifdef NONBE_FIX_ISSUE_2206

/*-------------------------------------------------------------------*

 * Copy_Scale_sig

 *
@@ -1302,7 +1301,6 @@ void Copy_Scale_sig_nosat( 


    return;

}

#endif



/*-------------------------------------------------------------------*

 * Copy_Scale_sig
@@ -1461,7 +1459,6 @@ void Copy_Scale_sig_32_16( 
    return;

}



#ifdef NONBE_FIX_ISSUE_2206

void Copy_Scale_sig_32_16_nosat(

    const Word32 x[], /* i  : signal to scale input           Qx        */

    Word16 y[],       /* o  : scaled signal output            Qx        */
@@ -1493,7 +1490,6 @@ void Copy_Scale_sig_32_16_nosat( 
    return;

}



#endif



/*-------------------------------------------------------------------*

 * Scale_sig32
@@ -5443,15 +5439,9 @@ Word16 L_norm_arr_cmplx( 
    return q;

}



#ifdef NONBE_FIX_ISSUE_2206

Word16 norm_arr(

    const Word16 *arr,

    Word16 size )

#else

Word16 norm_arr(

    Word16 *arr,

    Word16 size )

#endif

{

    Word16 q = 15;

    Word16 exp = 0;

lib_enc/acelp_core_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -21,11 +21,7 @@ 


ivas_error acelp_core_enc_fx(

    Encoder_State *st, /* i/o: encoder state structure                 */

#ifdef NONBE_FIX_ISSUE_2206

    const Word16 inp[], /* i  : input signal of the current frame       Q_new-1*/

#else

    const Word16 inp[], /* i  : input signal of the current frame       Q_new*/

#endif

    Word16 A[NB_SUBFR16k * ( M + 1 )],   /* i  : A(z) unquantized for the 4 subframes    Q12*/

    Word16 Aw[NB_SUBFR16k * ( M + 1 )],  /* i  : weighted A(z) unquant. for subframes    Q12*/

    const Word32 epsP[M + 1],            /* i  : LP prediction errors                    Qx*/