Commit 95459a60 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

reactivate first few macros

parent 8561e77e

lib_dec/core_dec_init_fx.c

+6 −6
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();