Commit f4c2c3dd authored by Fabian Bauer's avatar Fabian Bauer
Browse files

activate first few macors

parent d2cf96b5

lib_dec/core_dec_init_fx.c

+38 −38
Original line number Diff line number Diff line
@@ -1120,7 +1120,7 @@ void open_decoder_LPD_ivas_fx( 
    hTcxLtpDec = st->hTcxLtpDec;

    hTcxDec = st->hTcxDec;



#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

    {

        st->total_brate = total_brate;
@@ -1186,7 +1186,7 @@ void open_decoder_LPD_ivas_fx( 
    }

    st->bits_frame = extract_l( L_shr( Mpy_32_16_1( L_shl( st->total_brate, 1 ), 20972 ), 6 ) ); /* 20972 = 0.01 * 64 * 32768 */

    move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

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

    {

        assert( FSCALE_DENOM == 512 );
@@ -1255,7 +1255,7 @@ void open_decoder_LPD_ivas_fx( 
    }



    test();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

    /*TODO: CHECK THIS*/

    IF( EQ_32( st->sr_core, INT_FS_16k ) )

    {
@@ -1376,7 +1376,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 */
@@ -1482,7 +1482,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 ) )
@@ -1572,7 +1572,7 @@ void open_decoder_LPD_ivas_fx( 
                    move16();

                }

            }

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        }

#endif

        test();
@@ -1878,7 +1878,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;
@@ -1896,7 +1896,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*/
@@ -1909,7 +1909,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

        }
@@ -1925,7 +1925,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
@@ -1934,14 +1934,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
@@ -1955,7 +1955,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
@@ -1992,7 +1992,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;
@@ -2006,12 +2006,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*/
@@ -2071,7 +2071,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

    }
@@ -2091,7 +2091,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 );
@@ -2113,7 +2113,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 */
@@ -2181,20 +2181,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

    }
@@ -2205,7 +2205,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 );
@@ -2230,12 +2230,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

    }
@@ -2243,13 +2243,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

    }
@@ -2278,13 +2278,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;
@@ -2297,7 +2297,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 ) )

        {
@@ -2343,7 +2343,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 );
@@ -2352,7 +2352,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 /*HARMONIZE_2553_TonalConceal_Init*/
@@ -2392,7 +2392,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();
@@ -2411,7 +2411,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

    }
@@ -2423,20 +2423,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;
@@ -2458,7 +2458,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 )