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

re-activate HARMONIZE_2567_init_coder_ace_plus and checkin a fix

parent 6b12afe3

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 
#define HARMONIZE_2567_init_acelp                       /* FhG: harmonize init_acelp derivates for evs/ivas  */

#define HARMONIZE_2567_init_tcx_cfg                     /* FhG: harmonize init_tcx_cfg derivates for evs/ivas  */

#define HARMONIZE_2567_init_tcx                         /* FhG: harmonize init_tcx derivates for evs/ivas  */

//#define HARMONIZE_2567_init_coder_ace_plus              /* FhG: harmonize init_coder_ace_plus derivates for evs/ivas  */

#define HARMONIZE_2567_init_coder_ace_plus              /* FhG: harmonize init_coder_ace_plus derivates for evs/ivas  */

#define HARMONIZE_2567_init_core_sig_ana                /* FhG: harmonize init_core_sig_ana derivates for evs/ivas  */

/* #################### End BE switches ################################## */

lib_enc/core_enc_init_fx.c

+6 −3
Original line number Diff line number Diff line
@@ -1005,8 +1005,11 @@ void init_coder_ace_plus_ivas_fx( 
    {

        hTcxEnc->L_frameTCX = extract_l( Mult_32_16( st->input_Fs, INV_FRAME_PER_SEC_Q15 ) );

        move16();



#ifdef HARMONIZE_2567_init_coder_ace_plus

        IF( st->ini_frame == 0 && GT_16( st->element_mode, EVS_MONO ) )

#else

        IF( st->ini_frame == 0 )

#endif

        {

            set16_fx( hTcxEnc->Txnq, 0, L_FRAME32k / 2 + 64 );

            hTcxEnc->acelp_zir = hTcxEnc->Txnq + L_FRAME / 2;
@@ -1025,7 +1028,7 @@ void init_coder_ace_plus_ivas_fx( 
#ifdef HARMONIZE_2567_init_coder_ace_plus

    IF( ( st->element_mode == EVS_MONO && EQ_32( st->L_frame, L_FRAME16k ) && LE_32( st->total_brate, ACELP_32k ) ) )

#else

    IF( ( st->element_mode == EVS_MONO && EQ_32( st->L_frame, L_FRAME16k ) && LE_32( st->total_brate, ACELP_32k ) ) || ( st->element_mode > EVS_MONO && EQ_32( st->L_frame, L_FRAME16k ) && LE_32( st->total_brate, MAX_ACELP_BRATE ) ) )

    IF( ( EQ_16( st->element_mode, EVS_MONO ) && EQ_32( st->L_frame, L_FRAME16k ) && LE_32( st->total_brate, ACELP_32k ) ) || ( GT_16( st->element_mode, EVS_MONO ) && EQ_32( st->L_frame, L_FRAME16k ) && LE_32( st->total_brate, MAX_ACELP_BRATE ) ) )

#endif

    {

        st->nb_subfr = NB_SUBFR16k;
@@ -1051,7 +1054,7 @@ void init_coder_ace_plus_ivas_fx( 
#ifdef HARMONIZE_2567_init_coder_ace_plus

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

        {

            st->energyCoreLookahead_Fx = 0;

            st->prevTempFlatness_fx = 128 /*1.0f Q7*/;

            move16();

        }

        ELSE