Commit b4c7d392 authored by vaclav's avatar vaclav
Browse files

issue 992: remove unused enumerator member IVAS_FILTER_ORDER_2; under... 

issue 992: remove unused enumerator member IVAS_FILTER_ORDER_2; under FIX_992_REMOVE_IVAS_FILTER_ORDER_2
parent b7be58e4

lib_com/ivas_cnst.h

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

{

    IVAS_FILTER_ORDER_1 = 1,

#ifndef FIX_992_REMOVE_IVAS_FILTER_ORDER_2

    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 FIX_992_REMOVE_IVAS_FILTER_ORDER_2

    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 FIX_992_REMOVE_IVAS_FILTER_ORDER_2

        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 FIX_992_REMOVE_IVAS_FILTER_ORDER_2

        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_rom_com.c

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

};













#ifndef FIX_992_REMOVE_IVAS_FILTER_ORDER_2















const float ivas_lpf_2_butter_16k[IVAS_BIQUAD_FILT_LEN << 1] = 















{















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









@@ -3154,7 +3155,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 = 















{















    { 16384, 14924, 13463, 12003, 10542, 9082, 7622, 6161,

































lib_com/ivas_rom_com.h



+2
−0




























Original line number
Diff line number
Diff line








@@ -348,9 +348,11 @@ extern const int16_t Param_ISM_band_grouping[MAX_PARAM_ISM_NBANDS + 1];













extern const float ivas_lpf_4_butter_16k_sos[IVAS_BIQUAD_FILT_LEN << 2];















extern const float ivas_lpf_4_butter_32k_sos[IVAS_BIQUAD_FILT_LEN << 2];















extern const float ivas_lpf_4_butter_48k_sos[IVAS_BIQUAD_FILT_LEN << 2];













#ifndef FIX_992_REMOVE_IVAS_FILTER_ORDER_2















extern const float ivas_lpf_2_butter_16k[IVAS_BIQUAD_FILT_LEN << 1];















extern const float ivas_lpf_2_butter_32k[IVAS_BIQUAD_FILT_LEN << 1];















extern const float ivas_lpf_2_butter_48k[IVAS_BIQUAD_FILT_LEN << 1];













#endif































extern const float ivas_lfe_window_coeff_48k[IVAS_LFE_FADE_LEN_48K];















extern const float ivas_lfe_window_coeff_32k[IVAS_LFE_FADE_LEN_32K];