Commit 9332ccde authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Non bit exact optimizations in sba dec path 

Max MLD deviation observed < 0.1
normalizePanningGains_fx, dirac_out_synth_sfr, ivas_mdct_core_tns_ns_fx,
ivas_mct_dec functions changed
parent 713f2d39

lib_com/ivas_prot_fx.h

+14 −1
Original line number Diff line number Diff line
@@ -1575,7 +1575,12 @@ void ivas_mdct_core_tns_ns_fx( 
    Word32 *x_fx[CPE_CHANNELS][NB_DIV],                          /* o  : synthesis @internal_FS                 */

    Word32 Aq_fx[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )], /* o  : LP coefficients                        */

    const Word16 MCT_flag,                                       /* i  : hMCT handle allocated (1) or not (0)   */

    Word16 x_e[CPE_CHANNELS][NB_DIV] );

#ifdef OPT_SBA_DEC_V2_NBE

    Word16 x_e

#else  /* OPT_SBA_DEC_V2_NBE */

    Word16 x_e[CPE_CHANNELS][NB_DIV]

#endif /* OPT_SBA_DEC_V2_NBE */

);



void decoder_tcx_imdct_fx(

    Decoder_State *st,         /* i/o: coder memory state                      */
@@ -1936,9 +1941,17 @@ void ivas_mdct_core_invQ_fx( 
    Word16 fUseTns[CPE_CHANNELS][NB_DIV],              /* i  : flag TNS enabled                       */

    STnsData tnsData[CPE_CHANNELS][NB_DIV],            /* i  : TNS parameter                          */

    Word32 *x_0[CPE_CHANNELS][NB_DIV],                 /* i/o: signal buffer                          */

#ifdef OPT_SBA_DEC_V2_NBE

    Word16 x_0_e,

#else                                /* OPT_SBA_DEC_V2_NBE */

    Word16 x_0_e[CPE_CHANNELS][NB_DIV],

#endif                               /* OPT_SBA_DEC_V2_NBE */

    Word32 *x[CPE_CHANNELS][NB_DIV], /* i/o: signal buffer                          */

#ifdef OPT_SBA_DEC_V2_NBE

    Word16 x_e,

#else  /* OPT_SBA_DEC_V2_NBE */

    Word16 x_e[CPE_CHANNELS][NB_DIV],

#endif /* OPT_SBA_DEC_V2_NBE */

    Word16 x_len[CPE_CHANNELS][NB_DIV],

    Word16 Aq[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )], /* i  : LP coefficients                        */

    Word16 ms_mask[NB_DIV][MAX_SFB],                          /* i  : M/S mask                               */

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 


/* Note: each compile switch (FIX_1101_...) is independent from the other ones */

#define OPT_MCT_ENC_V2_NBE

#define OPT_SBA_DEC_V2_NBE

#define OPT_MCT_ENC_V1_NBE

#define OPT_MCT_ENC_V1_BE

#define OPT_SBA_REND_V1_BE

lib_com/prot_fx.h

+6 −2
Original line number Diff line number Diff line
@@ -6414,7 +6414,11 @@ void TonalMDCTConceal_Apply( 
void TonalMDCTConceal_Apply_ivas_fx(

    TonalMDCTConcealPtr hTonalMDCTConc, /*IN */

    Word32 *mdctSpectrum,               /*IN/OUT*/

#ifdef OPT_SBA_DEC_V2_NBE

    Word16 mdctSpectrum_exp, /*IN */

#else                        /* OPT_SBA_DEC_V2_NBE */

    Word16 mdctSpectrum_exp[L_FRAME48k], /*IN */

#endif                       /* OPT_SBA_DEC_V2_NBE */

    const PsychoacousticParameters *psychParamsCurrent );















void TonalMDCTConceal_InsertNoise_ivas_fx(

































lib_dec/dec_tcx_fx.c



+6
−0




























Original line number
Diff line number
Diff line








@@ -4761,14 +4761,19 @@ void decoder_tcx_noiseshaping_igf_fx(













    test();















    IF( bfi && st->tonal_mdct_plc_active && NE_16( st->element_mode, IVAS_CPE_MDCT ) )















    {













#ifndef OPT_SBA_DEC_V2_NBE















        Word16 tmp_x_fx_exp[L_FRAME48k], temp;















        temp = -MAX_16;















        move16();































        set16_fx( tmp_x_fx_exp, *x_e, L_frameTCX );















        TonalMDCTConceal_Apply_ivas_fx( st->hTonalMDCTConc, x_fx, tmp_x_fx_exp, st->hTcxCfg->psychParamsCurrent );













#else  /* OPT_SBA_DEC_V2_NBE */













        TonalMDCTConceal_Apply_ivas_fx( st->hTonalMDCTConc, x_fx, *x_e, st->hTcxCfg->psychParamsCurrent );













#endif /* OPT_SBA_DEC_V2_NBE */































        /* If exponent has been updated after TonalMDCTConceal_Apply, then shift the spectrum to common exponent. */













#ifndef OPT_SBA_DEC_V2_NBE















        FOR( i = 0; i < L_frameTCX; i++ )















        {















            temp = s_max( temp, tmp_x_fx_exp[i] );









@@ -4783,6 +4788,7 @@ void decoder_tcx_noiseshaping_igf_fx(













                move32();















            }















        }













#endif /* OPT_SBA_DEC_V2_NBE */















    }































    test();

































lib_dec/ivas_dirac_output_synthesis_cov_fx.c



+9
−0




























Original line number
Diff line number
Diff line








@@ -591,10 +591,14 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(













                /* apply residual mixing */















                {















                    Word16 shifter;













#ifdef OPT_SBA_DEC_V2_NBE













                    shifter = sub( mixing_matrix_res_smooth_e, 32 );













#else /* OPT_SBA_DEC_V2_NBE */















#ifdef OPT_SBA_DEC_V2_BE















                    shifter = sub( mixing_matrix_res_smooth_e, 31 );















#else  /* OPT_SBA_DEC_V2_BE */















                    shifter = 31 - mixing_matrix_res_smooth_e;













#endif /* OPT_SBA_DEC_V2_NBE */















#endif /* OPT_SBA_DEC_V2_BE */















                    FOR( ch_idx = 0; ch_idx < nY; ch_idx++ )















                    {









@@ -610,8 +614,13 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(













                        move64();















                        for ( i = 0; i < nY; i++ )















                        {













#ifdef OPT_SBA_DEC_V2_NBE













                            temp_real = W_mac_32_32( temp_real, mixing_matrix_res_smooth_fx[idx], diff_f_real_fx[i] );













                            temp_imag = W_mac_32_32( temp_imag, mixing_matrix_res_smooth_fx[idx], diff_f_imag_fx[i] );













#else  /* OPT_SBA_DEC_V2_NBE */















                            temp_real = W_add( temp_real, W_mult0_32_32( mixing_matrix_res_smooth_fx[idx], diff_f_real_fx[i] ) );















                            temp_imag = W_add( temp_imag, W_mult0_32_32( mixing_matrix_res_smooth_fx[idx], diff_f_imag_fx[i] ) );













#endif /* OPT_SBA_DEC_V2_NBE */















                            idx += nY;















                        }















#ifdef OPT_SBA_DEC_V2_BE