Commit 3665a9ce authored by vaclav's avatar vaclav
Browse files

Merge branch '1881-ref-PortFlpMr1641' into 'ivas-float-update' 

Port MR1641 from float to FLP-ref

See merge request !2019
parents 83da08f3 324315a6

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ 
#define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS              /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */

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

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

#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 */





/* #################### End BASOP porting switches ############################ */

lib_enc/swb_tbe_enc.c

+9 −0
Original line number Diff line number Diff line
@@ -280,6 +280,15 @@ void wb_tbe_enc( 
    }



    autocorr( hb_old_speech, R, LPC_SHB_ORDER_WB + 1, ( NS2SA( INT_FS_12k8, 5000000L ) + L_SUBFR + L_FRAME ) * 5 / 16, win_lpc_hb_wb, 0, 1, 1 );



#ifdef NONBE_FIX_1130_DIV_ZERO_LEV_DUR

    if ( st->element_mode > EVS_MONO )

    {

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

        R[0] = max( R[0], 1.0e-8f );

    }

#endif



    lev_dur( lpc_wb_temp, R, LPC_SHB_ORDER_WB, ervec_temp );

    a2lsp( lsp_wb_temp, lpc_wb_temp, LPC_SHB_ORDER_WB );

    lsp_spacing = 0.5f;