Commit d81e934d authored by multrus's avatar multrus
Browse files

[cleanup] accept PARAMMC_SHORT_ENC_MDFT

parent 4f523415

lib_com/ivas_cnst.h

+0 −4
Original line number Diff line number Diff line
@@ -1459,9 +1459,7 @@ typedef enum 
#define PARAM_MC_BAND_TO_MDCT_BAND_RATIO        16                          /* Ratio of resolution of CLDFB Bands to MDCT Bands */

#define PARAM_MC_SLOT_ENC_NS                    2500000L

#define PARAM_MC_MDFT_NO_SLOTS                  8

#ifdef PARAMMC_SHORT_ENC_MDFT

#define PARAM_MC_CLDFB_TO_MDFT_FAC              2

#endif



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

 * LFE Coding Constants
@@ -1678,9 +1676,7 @@ typedef enum 
#define IVAS_320_PT_LEN                         320

#define IVAS_240_PT_LEN                         240

#define IVAS_160_PT_LEN                         160

#ifdef PARAMMC_SHORT_ENC_MDFT

#define IVAS_120_PT_LEN                         120

#endif

#define IVAS_80_PT_LEN                          80

#define IVAS_40_PT_LEN                          40

lib_com/ivas_fb_mixer.c

+0 −4
Original line number Diff line number Diff line
@@ -163,11 +163,7 @@ ivas_error ivas_fb_set_cfg( 
    {

        pFb_cfg->fb_latency = NS2SA( sampling_rate, DELAY_FB_1_NS );

        pFb_cfg->fade_len = NS2SA( sampling_rate, DELAY_FB_1_NS );

#ifdef PARAMMC_SHORT_ENC_MDFT

        pFb_cfg->prior_input_length = NS2SA( sampling_rate, DELAY_DIRAC_ENC_CMP_NS ) + NS2SA( sampling_rate, PARAM_MC_SLOT_ENC_NS );

#else

        pFb_cfg->prior_input_length = NS2SA( sampling_rate, DELAY_DIRAC_ENC_CMP_NS ) + 3 * NS2SA( sampling_rate, PARAM_MC_SLOT_ENC_NS );

#endif

    }



    *pFb_cfg_out = pFb_cfg;

lib_com/ivas_mdft_imdft.c

+0 −2
Original line number Diff line number Diff line
@@ -82,11 +82,9 @@ static void ivas_get_mdft_twid_factors( 
        case IVAS_160_PT_LEN:

            *ppTwid = &ivas_mdft_coeff_cos_twid_160[0];

            break;

#ifdef PARAMMC_SHORT_ENC_MDFT

        case IVAS_120_PT_LEN:

            *ppTwid = &ivas_mdft_coeff_cos_twid_120[0];

            break;

#endif

        case IVAS_80_PT_LEN:

            *ppTwid = &ivas_mdft_coeff_cos_twid_80[0];

            break;

lib_com/ivas_rom_com.c

+0 −2
Original line number Diff line number Diff line
@@ -4055,7 +4055,6 @@ const float ivas_cos_twiddle_160[IVAS_160_PT_LEN >> 1] = 
    0.0760120586092433f,   0.0564205163668375f,   0.0368072229413588f,   0.0171797396307788f

};













#ifdef PARAMMC_SHORT_ENC_MDFT















const float ivas_mdft_coeff_cos_twid_120[IVAS_120_PT_LEN + 1] =















{















    1.0000000000f, 0.9999143276f, 0.9996573250f, 0.9992290362f, 0.9986295348f, 0.9978589232f, 0.9969173337f, 









@@ -4077,7 +4076,6 @@ const float ivas_mdft_coeff_cos_twid_120[IVAS_120_PT_LEN + 1] =













    0.1045284633f, 0.0915016187f, 0.0784590957f, 0.0654031292f, 0.0523359562f, 0.0392598158f, 0.0261769483f, 















    0.0130895956f, 0.0000000000f 















};













#endif





























const float ivas_sin_twiddle_80[IVAS_80_PT_LEN >> 1] = 















{

































lib_com/ivas_rom_com.h



+0
−2




























Original line number
Diff line number
Diff line








@@ -392,9 +392,7 @@ extern const float ivas_cos_twiddle_80[IVAS_80_PT_LEN >> 1];





























extern const float ivas_mdft_coeff_cos_twid_240[IVAS_240_PT_LEN + 1];















extern const float ivas_mdft_coeff_cos_twid_160[IVAS_160_PT_LEN + 1];













#ifdef PARAMMC_SHORT_ENC_MDFT















extern const float ivas_mdft_coeff_cos_twid_120[IVAS_120_PT_LEN + 1];













#endif















extern const float ivas_mdft_coeff_cos_twid_80[IVAS_80_PT_LEN + 1];















extern const float ivas_mdft_coeff_cos_twid_40[IVAS_40_PT_LEN + 1];















extern const float ivas_mdft_coeff_cos_twid_960[IVAS_960_PT_LEN + 1];