Commit 6b12afe3 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

deactivate HARMONIZE_2567_init_coder_ace_plus and insert assert to catch false element_modes

parent 7b894f1b

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_switch_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ void core_coder_mode_switch_fx( 
        st->igf = getIgfPresent_fx( st->element_mode, st->total_brate, st->bwidth, st->rf_mode );

        move16();

#ifdef HARMONIZE_2567_init_coder_ace_plus

        assert( st->element_mode == EVS_MONO );

        init_coder_ace_plus_fx( st, last_total_bitrate, 0, shift, MCT_flag );

#else

        init_coder_ace_plus_fx( st, last_total_bitrate, shift, MCT_flag );
@@ -402,6 +403,7 @@ void core_coder_mode_switch_ivas_fx( 
#endif



#ifdef HARMONIZE_2567_init_coder_ace_plus

        assert( st->element_mode != EVS_MONO );

        init_coder_ace_plus_fx( st, last_total_brate, st->total_brate, 0, MCT_flag );

#else

        init_coder_ace_plus_ivas_fx( st, last_total_brate, st->total_brate, MCT_flag );

lib_enc/init_enc_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -1135,6 +1135,7 @@ ivas_error init_encoder_fx( 
    IF( st->element_mode == EVS_MONO )

    {

#ifdef HARMONIZE_2567_init_coder_ace_plus

        assert( st->element_mode == EVS_MONO );

        init_coder_ace_plus_fx( st, st->last_total_brate, 0, 0, -10 /*hack*/ );

#else

        init_coder_ace_plus_fx( st, st->last_total_brate, 0, -10 /*hack*/ );
@@ -1154,6 +1155,7 @@ ivas_error init_encoder_fx( 




#ifdef HARMONIZE_2567_init_coder_ace_plus

        assert( st->element_mode != EVS_MONO );

        init_coder_ace_plus_fx( st, st->last_total_brate, igf_brate, 0, 0 );

#else

        init_coder_ace_plus_ivas_fx( st, st->last_total_brate, igf_brate, 0 );