Commit e363da44 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'main' into evs_dec_updates

parents 71615545 e8134e06

lib_com/ivas_prot_fx.h

+3 −3
Original line number Diff line number Diff line
@@ -2971,7 +2971,7 @@ Word16 ivas_acelp_tcx20_switching_fx( 
    Word16 non_staX,     /* i  : unbound non-stationarity for sp/mu clas */

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

    Word16 *voicing_fr,  /* i  : fractional voicing values               */

    Word16 currFlatness, /* i  : flatness                                */

    Word32 currFlatness, /* i  : flatness                                */

    Word16 lsp_mid[M],   /* i  : LSPs at the middle of the frame         */

    Word16 stab_fac,     /* i  : LP filter stability                     */

    Word32 *res_cod_SNR_M,
@@ -3088,7 +3088,7 @@ Word16 transient_analysis_ivas_fx( 


void set_transient_stereo_fx(

    CPE_ENC_HANDLE hCPE,  /* i  : CPE structure                           */

    Word16 currFlatness[] /* i/o: current flatness                       Q7*/

    Word32 currFlatness[] /* i/o: current flatness                       Q21*/

);



void ivas_smc_mode_selection_fx(
@@ -5941,7 +5941,7 @@ ivas_error pre_proc_front_ivas_fx( 
    Word16 *fft_buff_fx_q,                       /* o  : FFT buffer										*/

    const Word16 tdm_A_PCh_fx[M + 1],            /* i  : unq. LP coeff. of primary channel				Q12*/

    const Word16 tdm_lsp_new_PCh_fx[M],          /* i  : unq. LSPs of primary channel					Q15*/

    const Word16 currFlatness_fx,                /* i  : flatness parameter								Q7*/

    const Word32 currFlatness_fx,                /* i  : flatness parameter								Q21*/

    const Word16 tdm_ratio_idx,                  /* i  : Current Ratio_L index							Q0*/

    Word32 fr_bands_LR_fx[][2 * NB_BANDS],       /* i  : energy in frequency bands (fr_bands_LR_fx_q)	fr_bands_LR_fx_q*/

    Word16 fr_bands_LR_fx_q[CPE_CHANNELS],

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -173,4 +173,5 @@ 
#define OPT_BASOP_ADD_v1                        /* optimizations to avoid usage of BASOP_Util_Add_MantExp */

#define FIX_ISSUE_1327                          /* Ittiam: Fix for issue 1327: Glitch when stereo is switching from TD to FD*/

#define NONBE_FIX_1402_WAVEADJUST               /* VA: BASOP iisue 1402: fix waveform adjustment decoder PLC */

#define FIX_ISSUE_1376                          /* VA: Fix for issue 1376 (issue with GSC excitation) */

#endif

lib_enc/core_enc_init_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -1028,8 +1028,8 @@ void init_coder_ace_plus_ivas_fx( 
    {

        st->acelpFramesCount = 0;

        move16();

        st->prevTempFlatness_fx = 128 /*1.0f Q7*/;

        move16();

        st->prevTempFlatness_32fx = ONE_IN_Q21 /*1.0f Q21*/;

        move32();

    }



    /* Initialize TBE */

lib_enc/enc_pit_exc_fx.c

+7 −1
Original line number Diff line number Diff line
@@ -578,7 +578,9 @@ void enc_pit_exc_ivas_fx( 
    Word16 use_fcb;

    Word32 gc_mem[NB_SUBFR - 1]; /* gain_code from previous subframes */

    Word16 gp_mem[NB_SUBFR - 1]; /* gain_pitch from previous subframes*/

#ifndef FIX_ISSUE_1376

    Word16 h1_q15[PIT_EXC_L_SUBFR + ( M + 1 )];

#endif

    Word16 q_h1;

    BSTR_ENC_HANDLE hBstr = st_fx->hBstr;

    GSC_ENC_HANDLE hGSCEnc = st_fx->hGSCEnc;
@@ -771,11 +773,15 @@ void enc_pit_exc_ivas_fx( 
         * Codebook target computation

         * (No LP filtering of the adaptive excitation)

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

#ifndef FIX_ISSUE_1376

        Copy_Scale_sig( h1, h1_q15, L_subfr, 1 ); // Q14 -> Q15



        lp_select = lp_filt_exc_enc_ivas_fx( MODE1, AUDIO, i_subfr, exc, h1_q15,

                                             xn, y1, xn2, L_subfr, st_fx->L_frame, g_corr, clip_gain, &gain_pit, &lp_flag ); /* Q0 */



#else

        lp_select = lp_filt_exc_enc_ivas_fx( MODE1, AUDIO, i_subfr, exc, h1,

                                             xn, y1, xn2, L_subfr, st_fx->L_frame, g_corr, clip_gain, &gain_pit, &lp_flag ); /* Q0 */

#endif

        IF( EQ_16( lp_flag, NORMAL_OPERATION ) )

        {

            push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );

lib_enc/ivas_core_pre_proc_front_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ ivas_error pre_proc_front_ivas_fx( 
    Word16 *fft_buff_fx_q,                       /* o  : FFT buffer										*/

    const Word16 tdm_A_PCh_fx[M + 1],            /* i  : unq. LP coeff. of primary channel				Q12*/

    const Word16 tdm_lsp_new_PCh_fx[M],          /* i  : unq. LSPs of primary channel					Q15*/

    const Word16 currFlatness_fx,                /* i  : flatness parameter								Q7*/

    const Word32 currFlatness_fx,                /* i  : flatness parameter								Q21*/

    const Word16 tdm_ratio_idx,                  /* i  : Current Ratio_L index							Q0*/

    Word32 fr_bands_LR_fx[][2 * NB_BANDS],       /* i  : energy in frequency bands (fr_bands_LR_fx_q)	fr_bands_LR_fx_q*/

    Word16 fr_bands_LR_fx_q[CPE_CHANNELS],