Commit ba4df84c authored by multrus's avatar multrus
Browse files

further simplification wrt igf_brate

parent ce7123eb

lib_enc/core_enc_init_fx.c

+0 −11
Original line number Diff line number Diff line
@@ -1125,20 +1125,9 @@ void init_coder_ace_plus_ivas_fx( 


    test();

    IF( st->igf && st->hIGFEnc != NULL )

    {

#ifdef HARMONIZE_2567_init_functions

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

        {

            IGFEncSetMode_fx( st->hIGFEnc, st->total_brate, st->bwidth, st->element_mode, st->rf_mode );

        }

        ELSE

    {

        IGFEncSetMode_fx( st->hIGFEnc, igf_brate, st->bwidth, st->element_mode, st->rf_mode );

    }

#else

        IGFEncSetMode_fx( st->hIGFEnc, igf_brate, st->bwidth, st->element_mode, st->rf_mode );

#endif

    }

    ELSE IF( st->hIGFEnc != NULL )

    {

        st->hIGFEnc->infoTotalBitsWritten = 0;

lib_enc/core_enc_switch_fx.c

+1 −3
Original line number Diff line number Diff line
@@ -158,8 +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_functions

        assert( st->element_mode == EVS_MONO );

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

        init_coder_ace_plus_fx( st, last_total_bitrate, st->total_brate, shift, MCT_flag );

#else

        init_coder_ace_plus_fx( st, last_total_bitrate, shift, MCT_flag );

#endif
@@ -393,7 +392,6 @@ void core_coder_mode_switch_ivas_fx( 
        move16();



#ifdef HARMONIZE_2567_init_functions

        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

+1 −3
Original line number Diff line number Diff line
@@ -1133,8 +1133,7 @@ ivas_error init_encoder_fx( 
    IF( st->element_mode == EVS_MONO )

    {

#ifdef HARMONIZE_2567_init_functions

        assert( st->element_mode == EVS_MONO );

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

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

#else

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

#endif
@@ -1153,7 +1152,6 @@ ivas_error init_encoder_fx( 




#ifdef HARMONIZE_2567_init_functions

        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 );