Commit 28cf2d4d authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_MC_LFE_LPF

parent 58a0542d

lib_com/ivas_cnst.h

+0 −3
Original line number Diff line number Diff line
@@ -1565,9 +1565,6 @@ 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_fx.c

+0 −10
Original line number Diff line number Diff line
@@ -64,11 +64,7 @@ void ivas_filters_init_fx( 




    test();

#ifdef NONBE_FIX_MC_LFE_LPF

    IF( EQ_16( order, IVAS_FILTER_ORDER_1 ) )

#else

    IF( EQ_16( order, IVAS_FILTER_ORDER_2 ) || EQ_16( order, IVAS_FILTER_ORDER_1 ) )

#endif

    {

        filter_state->filt_len = add( order, 1 );

        move16();
@@ -170,9 +166,6 @@ void ivas_filter_process_fx( 
    SWITCH( filter_state->order )

    {

        case IVAS_FILTER_ORDER_1:

#ifndef NONBE_FIX_MC_LFE_LPF

        case IVAS_FILTER_ORDER_2:

#endif

            set_val_Word16( pIn_Out_e, sub( Q31, q_factor ), length );

            ivas_iir_2_filter_fx( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_0, pIn_Out_e );

            /* Scale pIn_Out_fx back to input Q */
@@ -211,9 +204,6 @@ void ivas_filter_process_exp_fx( 
    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_fx( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_0, pIn_Out_e );

            /* Scale pIn_Out_fx back to input Q */

            BREAK;

lib_com/ivas_lfe_com_fx.c

+0 −18
Original line number Diff line number Diff line
@@ -59,24 +59,6 @@ void ivas_lfe_lpf_select_filt_coeff_fx( 
    SWITCH( order )

    {



#ifndef NONBE_FIX_MC_LFE_LPF

        case IVAS_FILTER_ORDER_2:

            SWITCH( sampling_rate )

            {

                case 16000:

                    *ppFilt_coeff_fx = ivas_lpf_2_butter_16k_fx; // Q30

                    BREAK;

                case 32000:

                    *ppFilt_coeff_fx = ivas_lpf_2_butter_32k_fx; // Q30

                    BREAK;

                case 48000:

                    *ppFilt_coeff_fx = ivas_lpf_2_butter_48k_fx; // Q30

                    BREAK;

                default:

                    BREAK;

            }

            BREAK;

#endif

        case IVAS_FILTER_ORDER_4:

            SWITCH( sampling_rate )

            {

lib_com/ivas_prot_fx.h

+0 −4
Original line number Diff line number Diff line
@@ -857,11 +857,7 @@ void ivas_lfe_dec_close_fx( 
ivas_error ivas_create_lfe_dec_fx(

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

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

#ifdef NONBE_FIX_MC_LFE_LPF

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

#else

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

#endif

);



void ivas_lfe_dec_fx(

lib_com/ivas_rom_com.c

+0 −2
Original line number Diff line number Diff line
@@ -2594,9 +2594,7 @@ const Word16 ivas_lfe_num_dct_pass_bins_tbl[IVAS_LFE_NUM_COEFFS_IN_SUBGRP] = { 8 
const Word16 ivas_lfe_min_shift_tbl[IVAS_LFE_NUM_COEFFS_IN_SUBGRP] = { 1, 0 };



const Word16 ivas_lfe_lpf_delay_Q15[2] = { 57, 114 };

#ifdef NONBE_FIX_MC_LFE_LPF

const Word32 ivas_lfe_lpf_delay_ns[2] = { 1750000, 3500000 };

#endif



const Word16 dirac_gains_P_idx[16] = 

{