Commit 77081902 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch '1862_ref_mr1517_lfe_lpf' into 'ivas-float-update' 

[non-BE] float ref changes for float MR 1517

See merge request !1985
parents 91d841ab 03661f93

lib_com/ivas_cnst.h

+2 −0
Original line number Diff line number Diff line
@@ -1430,7 +1430,9 @@ typedef enum 
typedef enum

{

    IVAS_FILTER_ORDER_1 = 1,

#ifndef NONBE_FIX_MC_LFE_LPF

    IVAS_FILTER_ORDER_2 = 2,

#endif

    IVAS_FILTER_ORDER_4 = 4,

} ivas_filter_order;

lib_com/ivas_filters.c

+6 −0
Original line number Diff line number Diff line
@@ -62,7 +62,11 @@ void ivas_filters_init( 
    int16_t i;

    filter_state->order = order;



#ifdef NONBE_FIX_MC_LFE_LPF

    if ( order == IVAS_FILTER_ORDER_1 )

#else

    if ( order == IVAS_FILTER_ORDER_2 || order == IVAS_FILTER_ORDER_1 )

#endif

    {

        filter_state->filt_len = order + 1;
@@ -116,7 +120,9 @@ void ivas_filter_process( 
    switch ( filter_state->order )

    {

        case IVAS_FILTER_ORDER_1:

#ifndef NONBE_FIX_MC_LFE_LPF

        case IVAS_FILTER_ORDER_2:

#endif

            ivas_iir_2_filter( filter_state, pIn_Out, length, IVAS_FILTER_STAGE_0 );

            break;

        case IVAS_FILTER_ORDER_4:

lib_com/ivas_lfe_com.c

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ void ivas_lfe_lpf_select_filt_coeff( 
{

    switch ( order )

    {

#ifndef NONBE_FIX_MC_LFE_LPF

        case IVAS_FILTER_ORDER_2:

            switch ( sampling_rate )

            {
@@ -76,6 +77,7 @@ void ivas_lfe_lpf_select_filt_coeff( 
                    break;

            }

            break;

#endif

        case IVAS_FILTER_ORDER_4:

            switch ( sampling_rate )

            {

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -5486,7 +5486,11 @@ void ivas_lfe_enc( 
ivas_error ivas_create_lfe_dec( 

    LFE_DEC_HANDLE *hLFE_out,                                   /* o  : IVAS LFE decoder structure              */

    const int32_t output_Fs,                                    /* i  : output sampling rate                    */

#ifdef NONBE_FIX_MC_LFE_LPF

    const int32_t delay_ns                                      /* i  : additional LFE delay to sync other channel outputs */

#else

    const int32_t binauralization_delay_ns                      /* i  : additional LFE delay to sync with binaural renderer */

#endif

);



void ivas_lfe_dec_close(

lib_com/ivas_rom_com.c

+2 −0
Original line number Diff line number Diff line
@@ -3120,6 +3120,7 @@ const float ivas_lpf_4_butter_48k_sos[IVAS_BIQUAD_FILT_LEN << 2] = 
    1.00000000471366f, 1.f , -1.98677297369091f,    0.987060670205863f 

};













#ifndef NONBE_FIX_MC_LFE_LPF















const float ivas_lpf_2_butter_16k[IVAS_BIQUAD_FILT_LEN << 1] = 















{















    0.000628720643081143f,    0.00125744128616229f, 0.000628720643081143f, 1.f, -1.92783286977036f,    0.930347752342683f 









@@ -3134,6 +3135,7 @@ const float ivas_lpf_2_butter_48k[IVAS_BIQUAD_FILT_LEN << 1] =













{















    7.15317998432330e-05f,    0.000143063599686466f,    7.15317998432330e-05f, 1.f, -1.97593552482925f,    0.976221652028620f 















};













#endif





























const ivas_lfe_freq_models ivas_str_lfe_freq_models = 















{