Commit 0f0b21cc authored by Jan Kiene's avatar Jan Kiene
Browse files

accept FIX_572_LFE_LPF_ENC

parent 8ce0c56e

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -5372,7 +5372,6 @@ void ivas_lfe_synth_with_filters( 
);





#ifdef FIX_572_LFE_LPF_ENC

/*----------------------------------------------------------------------------------*

 * LFE encoder low pass filter prototypes

 *----------------------------------------------------------------------------------*/
@@ -5391,7 +5390,6 @@ void ivas_lfe_lpf_enc_apply( 
    float data_lfe_ch[],                                        /* i/o: LFE signal                              */

    const int16_t input_frame                                   /* i  : input frame length per channel          */

);

#endif





/*----------------------------------------------------------------------------------*

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ 
#define FIX_564                                         /* Nokia: Issue 564: Fix gains in JBM path for SBA with parametric binaural renderer */

#define FIX_559_EXTL_IGF_MISMATCH                       /* VA: issue 559: fix mismatch between st->extl and st->igf observed as crash in PlanarSBA bitrate switching */

#define FIX_571_REVERB_NOT_ACTIVATED_ISM                /* Philips: Issue 571: Reverb not activated for discrete and parametric ISM */

#define FIX_572_LFE_LPF_ENC                             /* FhG: issue 572: always apply the low pass filter to the LFE channel */

#define FIX_QMETA_SID_5k2                               /* Nokia: Issue 137: enable using full 5.2k bitrate in MASA SID */

#define FIX_578_PARAMMC_ILD_BS                          /* FhG: Issue 578: transmitt also center ILD in band 0 when LFE is active in 3TC ParamMC */

#define FIX_UNCLR_ISSUE                                 /* VoiceAge: issue 574: Fix UNCLR mis-classifications in noisy speech stereo */

lib_enc/ivas_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -276,10 +276,8 @@ ivas_error ivas_enc( 


        hMetaData = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData : st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData;



#ifdef FIX_572_LFE_LPF_ENC

        /* LFE low pass filter */

        ivas_lfe_lpf_enc_apply( st_ivas->hLfeLpf, data_f[LFE_CHANNEL], input_frame );

#endif



        /* LFE channel encoder */

        if ( st_ivas->mc_mode == MC_MODE_MCT )

lib_enc/ivas_init_enc.c

+0 −6
Original line number Diff line number Diff line
@@ -314,10 +314,8 @@ void ivas_initialize_handles_enc( 
    /* LFE  handle */

    st_ivas->hLFE = NULL;



#ifdef FIX_572_LFE_LPF_ENC

    /* LFE low pass filter handle */

    st_ivas->hLfeLpf = NULL;

#endif



    return;

}
@@ -548,12 +546,10 @@ ivas_error ivas_init_encoder( 


        hEncoderConfig->nchan_inp = ivas_mc_ls_setup_get_num_channels( hEncoderConfig->mc_input_setup );



#ifdef FIX_572_LFE_LPF_ENC

        if ( ( error = ivas_create_lfe_lpf_enc( &st_ivas->hLfeLpf, hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#endif



        if ( st_ivas->mc_mode == MC_MODE_MCT )

        {
@@ -956,10 +952,8 @@ void ivas_destroy_enc( 
    /* LFE handle */

    ivas_lfe_enc_close( &( st_ivas->hLFE ) );



#ifdef FIX_572_LFE_LPF_ENC

    /* LFE low pass filter state */

    ivas_lfe_lpf_enc_close( &( st_ivas->hLfeLpf ) );

#endif



    /* Param-Upmix MC handle */

    ivas_mc_paramupmix_enc_close( &( st_ivas->hMCParamUpmix ), st_ivas->hEncoderConfig->input_Fs );

lib_enc/ivas_lfe_enc.c

+0 −13
Original line number Diff line number Diff line
@@ -344,10 +344,6 @@ void ivas_lfe_enc( 
    zero_pad_len = hLFE->pWindow_state->zero_pad_len;

    pWindow_coeffs = hLFE->pWindow_state->pWindow_coeffs;



#ifndef FIX_572_LFE_LPF_ENC

    /*Low Pass Filter */

    ivas_filter_process( &hLFE->filter_state, data_lfe_ch, input_frame );

#endif

    /* Windowing */

    ivas_dct_windowing( fade_len, full_len, dct_len, zero_pad_len, pWindow_coeffs, input_frame, wtda_audio, hLFE->old_wtda_audio, data_lfe_ch );
@@ -382,9 +378,6 @@ ivas_error ivas_create_lfe_enc( 
{

    int16_t input_frame;

    LFE_ENC_HANDLE hLFE;

#ifndef FIX_572_LFE_LPF_ENC

    const float *filt_coeff;

#endif

    int16_t i, j;



    input_frame = (int16_t) ( input_Fs / FRAMES_PER_SEC );
@@ -426,10 +419,6 @@ ivas_error ivas_create_lfe_enc( 


    lfe_window_init( hLFE->pWindow_state, input_Fs, input_frame );



#ifndef FIX_572_LFE_LPF_ENC

    ivas_lfe_lpf_select_filt_coeff( input_Fs, IVAS_FILTER_ORDER_4, &filt_coeff );

    ivas_filters_init( &hLFE->filter_state, filt_coeff, IVAS_FILTER_ORDER_4 );

#endif



    /* Initialization for entropy coding */

    hLFE->cum_freq_models[0][0] = ivas_str_lfe_freq_models.entropy_coder_model_fine_sg1;
@@ -489,7 +478,6 @@ void ivas_lfe_enc_close( 
    return;

}



#ifdef FIX_572_LFE_LPF_ENC

/*-------------------------------------------------------------------------

 * ivas_create_lfe_lpf_enc()

 *
@@ -563,4 +551,3 @@ void ivas_lfe_lpf_enc_apply( 


    return;

}
 
#endif