Commit 9e8c9e38 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

reactivated all macros in harmonized function

parent dee81ea3

lib_dec/core_dec_init_fx.c

+48 −48
Original line number Diff line number Diff line
@@ -1386,7 +1386,7 @@ void open_decoder_LPD_ivas_fx( 


        IF( st->hTcxDec != NULL )

        {

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

            {

                set16_fx( hTcxDec->old_syn_Overl, 0, shr( L_FRAME32k, 1 ) ); /* hTcxDec->Q_syn_Overl_TDACFB */
@@ -1492,7 +1492,7 @@ void open_decoder_LPD_ivas_fx( 
        test();

        test();

        test();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

        {

            IF( ( NE_16( st->element_mode, IVAS_CPE_DFT ) || ( EQ_16( st->element_mode, IVAS_CPE_DFT ) && st->prev_bfi ) ) && EQ_16( st->last_codec_mode, MODE1 ) && ( st->last_core == ACELP_CORE ) )
@@ -1582,7 +1582,7 @@ void open_decoder_LPD_ivas_fx( 
                    move16();

                }

            }

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        }

#endif

        test();
@@ -1619,7 +1619,7 @@ void open_decoder_LPD_ivas_fx( 
            /*OLA -> zero */

            IF( st->hTcxDec != NULL )

            {

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

                {

                    set16_fx( hTcxDec->old_syn_Overl, 0, L_FRAME32k / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/     /* Q_old_syn_Overl */
@@ -1631,7 +1631,7 @@ void open_decoder_LPD_ivas_fx( 
                {

#endif

                    reset_tcx_overl_buf_fx( st->hTcxDec );

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

                }

#endif

            }
@@ -1639,12 +1639,12 @@ void open_decoder_LPD_ivas_fx( 
            IF( st->hTcxCfg != NULL )

            {

                Copy_Scale_sig( hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), hTcxDec->syn_OverlFB, st->hTcxCfg->tcx_mdct_window_lengthFB, negate( add( hHQ_core->Q_old_wtda, TCX_IMDCT_HEADROOM ) ) ); /* Q_old_out */

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

                {

#endif

                    *Q_syn_OverlFB = *Q_old_out;

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

                }

#endif

                move16();
@@ -1670,7 +1670,7 @@ void open_decoder_LPD_ivas_fx( 
            }



            /* reset CLDFB memories */

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

            {

                cldfb_reset_memory( st->cldfbAna );
@@ -1687,7 +1687,7 @@ void open_decoder_LPD_ivas_fx( 
                {

                    cldfb_reset_memory_fx( st->cldfbSynHB );

                }

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

            }

#endif

        }
@@ -1709,13 +1709,13 @@ void open_decoder_LPD_ivas_fx( 
            E_LPC_f_lsp_a_conversion( st->lsp_old_fx, st->old_Aq_12_8_fx, M );

            Copy( st->lsp_old_fx, st->lspold_uw, M ); /* Q15 */

            Copy( st->lsf_old_fx, st->lsfold_uw, M ); /* Q2.56 */

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

            {

#endif

                *Q_old_Aq_12_8 = 14;

                move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

            }

#endif

            IF( !st->last_con_tcx )
@@ -1745,7 +1745,7 @@ void open_decoder_LPD_ivas_fx( 
            lerp( st->mem_syn_r + sub( L_SYN_MEM, mem_syn_r_size_old ), st->mem_syn_r + sub( L_SYN_MEM, mem_syn_r_size_new ), mem_syn_r_size_new, mem_syn_r_size_old );

            Copy( st->mem_syn_r + L_SYN_MEM - M, st->mem_syn2_fx, M ); /* Qx */

        }

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        ELSE IF( EQ_16( st->element_mode, EVS_MONO ) && ( !st->tcxonly && EQ_16( st->L_frame, L_FRAME16k ) && GT_32( st->last_total_brate, ACELP_32k ) ) )

        {

            lsp2lsf_fx( st->lsp_old_fx, st->lsf_old_fx, M, st->sr_core );
@@ -1821,7 +1821,7 @@ void open_decoder_LPD_ivas_fx( 
                {

                    st->hPFstat->reset = 0;

                    move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

                    {

                        Scale_sig( st->hPFstat->mem_pf_in, L_SUBFR, negate( st->Q_syn ) ); /* WB post_filter mem */ /* q_mem - st->Q_syn */
@@ -1835,7 +1835,7 @@ void open_decoder_LPD_ivas_fx( 
        }

        ELSE

        {

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD



            IF( st->hPFstat != NULL && EQ_16( st->element_mode, EVS_MONO ) )

            {
@@ -1888,7 +1888,7 @@ void open_decoder_LPD_ivas_fx( 
    st->last_gain_syn_deemph = 32768 / 2; /* 1.f Q14*/

    move16();



#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

    {

        st->last_gain_syn_deemph_e = 1;
@@ -1906,7 +1906,7 @@ void open_decoder_LPD_ivas_fx( 
        move16();

        if ( hTcxDec != NULL )

        {

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

            {

                hTcxDec->conceal_eof_gain = 32768 / 2; /*Q14*/
@@ -1919,7 +1919,7 @@ void open_decoder_LPD_ivas_fx( 
                hTcxDec->conceal_eof_gain_e = 1;

                move16();

                move32();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

            }

#endif

        }
@@ -1935,7 +1935,7 @@ void open_decoder_LPD_ivas_fx( 
        move16();

        st->last_core_bfi = -1;

        move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

        {

#endif
@@ -1944,14 +1944,14 @@ void open_decoder_LPD_ivas_fx( 
                hTcxDec->tcxConceal_recalc_exc = 0;

                move16();

            }

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        }

#endif

    }

    st->prev_old_bfi = 0;

    move16();



#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

    {

#endif
@@ -1965,7 +1965,7 @@ void open_decoder_LPD_ivas_fx( 
            move16();

            set16_fx( st->hTcxDec->ltpGainMemory_fx, 0, N_LTP_GAIN_MEMS ); /* Q15 */

        }

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

    }

#endif
@@ -2002,7 +2002,7 @@ void open_decoder_LPD_ivas_fx( 
    move32();

    st->Mode2_lp_gainp = 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->hTcxDec->prev_widow_left_rect = 0;
@@ -2016,12 +2016,12 @@ void open_decoder_LPD_ivas_fx( 
        st->lp_gainp_fx = 0; /* Q14 */

        move16();



#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

    }

#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 ) )

        {
@@ -2349,11 +2349,11 @@ void open_decoder_LPD_ivas_fx( 
        move16();

        st->hTonalMDCTConc->lastBlockData.nSamples = 0;

        move16();

#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

#ifndef HARMONIZE_2583_open_decoder_LPDTonalConcealseparateinit

        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,10 +2362,10 @@ 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*/

#endif /*#ifndef HARMONIZE_2583_open_decoder_LPDTonalConcealseparateinit*/

    }



    st->last_tns_active = 0;
@@ -2402,7 +2402,7 @@ void open_decoder_LPD_ivas_fx( 
    test();

    IF( ( EQ_32( total_brate, ACELP_9k60 ) || EQ_32( total_brate, ACELP_16k40 ) || EQ_32( total_brate, ACELP_24k40 ) ) && st->element_mode == EVS_MONO )

    {

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

        {

            test();
@@ -2421,7 +2421,7 @@ void open_decoder_LPD_ivas_fx( 
#endif

            st->dec_glr = 1;

            move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        }

#endif

    }
@@ -2433,20 +2433,20 @@ void open_decoder_LPD_ivas_fx( 


    st->dec_glr_idx = 0;

    move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

    {

#endif

        st->VAD = 0;

        move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

    }

#endif

    IF( hTcxDec != NULL )

    {

        hTcxDec->enableTcxLpc = 1;

        move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

        {

            st->VAD = 0;
@@ -2468,7 +2468,7 @@ void open_decoder_LPD_ivas_fx( 
        move16();

    }



#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

    {

        if ( hTcxLtpDec != NULL )