Commit 09e5c985 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

activated 16 more macros

parent 6637123a

lib_dec/core_dec_init_fx.c

+17 −17
Original line number Diff line number Diff line
@@ -2021,7 +2021,7 @@ void open_decoder_LPD_ivas_fx( 
#endif

    IF( st->hTcxDec != NULL )

    {

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        IF( EQ_16( st->element_mode, EVS_MONO ) )

        {

            hTcxDec->conCngLevelBackgroundTrace = PLC_MIN_CNG_LEV_Q21; /*Q21*/
@@ -2081,7 +2081,7 @@ void open_decoder_LPD_ivas_fx( 
                hTcxDec->cummulative_damping_tcx = 32767 /*1.0f Q15*/;

                move16();

            }

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        }

#endif

    }
@@ -2101,7 +2101,7 @@ void open_decoder_LPD_ivas_fx( 
    }

    st->old_fpitch = L_deposit_h( st->pit_min );

    move32();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

    IF( EQ_16( st->element_mode, EVS_MONO ) )

    {

        st->old_fpitchFB = L_deposit_h( hTcxDec->pit_min_TCX );
@@ -2123,7 +2123,7 @@ void open_decoder_LPD_ivas_fx( 
    st->voice_fac = -1;

    move16();



#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

    IF( EQ_16( st->element_mode, EVS_MONO ) )

    {

        /* TCX-LTP */
@@ -2191,20 +2191,20 @@ void open_decoder_LPD_ivas_fx( 
            hTcxDec->envWeighted = 0;

            move16();

        }

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

    }

#endif

    IF( st->hBPF != NULL )

    {

        st->lp_error_ener = Mpy_32_16_1( L_shl( hBPF->pst_lp_ener_fx, 8 ), 0x2a86 ); /* convert from 7Q8 10*log10 -> 15Q16, log2 */

        move32();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        IF( GT_16( st->element_mode, EVS_MONO ) )

        {

#endif

            hBPF->pst_mem_deemp_err_fx = 0; /* Q_syn2 - 1 */

            move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        }

#endif

    }
@@ -2215,7 +2215,7 @@ void open_decoder_LPD_ivas_fx( 
    }

    st->mem_error = L_deposit_l( 0 );

    move32();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

    IF( EQ_16( st->element_mode, EVS_MONO ) )

    {

        st->hTcxCfg->ctx_hm = getCtxHm( st->element_mode, total_brate, st->rf_flag );
@@ -2240,12 +2240,12 @@ void open_decoder_LPD_ivas_fx( 
    IF( st->tcxonly )

    {

        st->p_bpf_noise_buf = NULL;

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        IF( GT_16( st->element_mode, EVS_MONO ) )

        {

#endif

            st->p_bpf_noise_buf_32 = NULL;

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        }

#endif

    }
@@ -2253,13 +2253,13 @@ void open_decoder_LPD_ivas_fx( 
    {

        st->p_bpf_noise_buf = st->bpf_noise_buf;

        move32();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        IF( GT_16( st->element_mode, EVS_MONO ) )

        {

#endif

            st->p_bpf_noise_buf_32 = st->bpf_noise_buf_32;

            move32();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        }

#endif

    }
@@ -2288,13 +2288,13 @@ void open_decoder_LPD_ivas_fx( 


    st->flagGuidedAcelp = 0;

    move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

    IF( GT_16( st->element_mode, EVS_MONO ) )

    {

#endif

        st->tonal_mdct_plc_active = 0;

        move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

    }

#endif

    st->T0_4th = L_SUBFR;
@@ -2307,7 +2307,7 @@ void open_decoder_LPD_ivas_fx( 
    {

        st->enablePlcWaveadjust = 1;

        move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        Word32 last_total_brate_condition;

        IF( GT_16( st->element_mode, EVS_MONO ) )

        {
@@ -2353,7 +2353,7 @@ void open_decoder_LPD_ivas_fx( 
        TonalMDCTConceal_Init_fx( st->element_mode, st->hTonalMDCTConc, st->hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );

#else



#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        IF( EQ_16( st->element_mode, EVS_MONO ) )

        {

            TonalMDCTConceal_Init_fx( st->hTonalMDCTConc, hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );
@@ -2362,7 +2362,7 @@ void open_decoder_LPD_ivas_fx( 
        {

#endif

            TonalMDCTConceal_Init_ivas_fx( st->hTonalMDCTConc, st->hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        }

#endif

#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/