Commit b90708f4 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1130_DIV_ZERO_LEV_DUR

parent 121a35aa

lib_com/options.h

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


/* #################### Start BASOP porting switches ############################ */



#define NONBE_FIX_1130_DIV_ZERO_LEV_DUR                 /* VA: issue 1130: avoid div by zero in L-D by thresholding R[0] to a min value of 100.0 */

#define FIX_1111_TDM_LSP_BUFFER                         /* VA: issue 1111: remove unused buffer `tdm_lspQ_PCh[]' */

#define FIX_1157_OBSOLETE_DMX_TABLE                     /* FhG: remove obsolte ParamMC DMX table ivas_param_mc_dmx_fac_CICP19_4tc[] */

#define NONBE_1325_TD_STEREO_QUANT_LSF_SEC              /* Nokia: issue 1325: fix for usage of active_cnt variable in TD stereo LSFQ */

lib_enc/swb_tbe_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -784,14 +784,12 @@ void wb_tbe_enc_fx( 


    autocorr_fx( hb_old_speech, LPC_SHB_ORDER_WB + 1, R_h, R_l, &Q_R, WBTBE_LPCWIN_LENGTH, win_lpc_hb_wb_fx, 0, 1 );



#ifdef NONBE_FIX_1130_DIV_ZERO_LEV_DUR

    if ( st_fx->element_mode > EVS_MONO )

    {

        /* Ensure R[0] isn't zero when entering Levinson-Durbin */

        R_l[0] = s_max( R_l[0], 1 );

        move16();

    }

#endif



    E_LPC_lev_dur( R_h, R_l, lpc_wb_temp_fx, LepsP, LPC_SHB_ORDER_WB, NULL );
@@ -1390,11 +1388,9 @@ void wb_tbe_enc_ivas_fx( 


    autocorr_fx( hb_old_speech, LPC_SHB_ORDER_WB + 1, R_h, R_l, &Q_R, ( ( NS2SA( INT_FS_12k8, 5000000L ) + L_SUBFR + L_FRAME ) * 5 / 16 ), win_lpc_hb_wb_ivas_fx, 0, 1 );



#ifdef NONBE_FIX_1130_DIV_ZERO_LEV_DUR

    /* Ensure R[0] isn't zero when entering Levinson-Durbin */

    R_l[0] = s_max( R_l[0], 1 );

    move16();

#endif



    E_LPC_lev_dur( R_h, R_l, lpc_wb_temp_fx, LepsP, LPC_SHB_ORDER_WB, NULL ); // Since 0th index will be 1 in floating point buffer, in fixed point one has to take norm of 0th index to identify the Q-factor