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

reactivate all macros inside harmonized function

parent 3804dd97

lib_dec/core_dec_init_fx.c

+6 −6
Original line number Diff line number Diff line
@@ -2388,7 +2388,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();
@@ -2407,7 +2407,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

    }
@@ -2419,20 +2419,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;
@@ -2454,7 +2454,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 )