Commit 430a265e authored by Fabian Bauer's avatar Fabian Bauer
Browse files

more fix

parent 2d051dd5

lib_enc/core_enc_init_fx.c

+9 −15
Original line number Diff line number Diff line
@@ -1151,23 +1151,17 @@ void init_coder_ace_plus_ivas_fx( 
#endif

    }



#ifdef HARMONIZE_2567_init_coder_ace_plus

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

    {

#endif

#ifndef HARMONIZE_2567_init_coder_ace_plus

    /* Initialize Core Signal Analysis Module */

    init_core_sig_ana_ivas_fx( st );

#ifdef HARMONIZE_2567_init_coder_ace_plus

    }

#endif



    /* Initialize TCX */

    IF( hTcxEnc != NULL )

    {

#ifdef HARMONIZE_2567_init_tcx

#ifdef HARMONIZE_2567_init_coder_ace_plus

        init_tcx_fx( st, L_frame_old, st->total_brate, last_total_brate, MCT_flag );

#else

#ifdef HARMONIZE_2567_init_coder_ace_plus

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

        {

            init_tcx_ivas_fx( st, L_frame_old, st->total_brate, last_total_brate, MCT_flag );
@@ -1176,19 +1170,18 @@ void init_coder_ace_plus_ivas_fx( 
        {

            init_tcx_fx( st, L_frame_old, st->total_brate, last_total_brate, MCT_flag );

        }

#else

        init_tcx_ivas_fx( st, L_frame_old, st->total_brate, last_total_brate, MCT_flag );

#endif



#endif

    }



#ifdef HARMONIZE_2567_init_coder_ace_plus

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

    {

        /* Initialize Core Signal Analysis Module */

        init_core_sig_ana_fx( st );

    }

    ELSE

    {

        init_core_sig_ana_ivas_fx( st );

    }

#endif



    /* Initialize Signal Buffers */
@@ -1205,6 +1198,7 @@ void init_coder_ace_plus_ivas_fx( 
    init_sig_buffers_ivas_fx( st, L_frame_old, L_subfr, last_total_brate );

#endif





    /* Initialize ACELP */

#ifdef HARMONIZE_2567_init_coder_ace_plus

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