Commit 16a71a37 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_920_IGF_INIT_ERROR

parent b0768339

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_920_IGF_INIT_ERROR                          /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */

#define FIX_SPLITREND_WARNINGS                          /* FhG: fix warnings related to split rendering observed in build jobs */

#define FIX_923_EXTERNAL_REND_COMMAND_LINE              /* VA: issue 923: enable external renderer command-line options in UPPER case letters */

#define FIX_921_OMASA_DELAY_PRINTOUT                    /* VA: issue 921: correct OMASA decoder delay printout */

lib_com/prot.h

+0 −2
Original line number Diff line number Diff line
@@ -6760,9 +6760,7 @@ float correlation_shift( 
void init_coder_ace_plus(

    Encoder_State *st,              /* i  : Encoder state handle                */

    const int32_t last_total_brate, /* i  : last total bitrate                  */

#ifdef FIX_920_IGF_INIT_ERROR

    const int32_t igf_brate, /* i  : IGF configuration bitrate           */

#endif

    const int16_t MCT_flag /* i  : hMCT handle allocated (1) or not (0)*/

);

lib_enc/core_enc_init.c

+0 −6
Original line number Diff line number Diff line
@@ -64,9 +64,7 @@ static void init_modes( Encoder_State *st, const int32_t last_total_brate ); 
void init_coder_ace_plus(

    Encoder_State *st,              /* i  : Encoder state                          */

    const int32_t last_total_brate, /* i  : last total bitrate                     */

#ifdef FIX_920_IGF_INIT_ERROR

    const int32_t igf_brate, /* i  : IGF configuration bitrate              */

#endif

    const int16_t MCT_flag /* i  : hMCT handle allocated (1) or not (0)   */

)

{
@@ -157,11 +155,7 @@ void init_coder_ace_plus( 


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

    {

#ifdef FIX_920_IGF_INIT_ERROR

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

#else

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

#endif

    }

    else if ( st->hIGFEnc != NULL )

    {

lib_enc/core_enc_switch.c

+0 −4
Original line number Diff line number Diff line
@@ -152,11 +152,7 @@ void core_coder_mode_switch( 
    else

    {

        st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode );

#ifdef FIX_920_IGF_INIT_ERROR

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

#else

        init_coder_ace_plus( st, last_total_brate, MCT_flag );

#endif

    }



    if ( st->igf && st->hBWE_TD != NULL )

lib_enc/init_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -825,11 +825,7 @@ ivas_error init_encoder( 
    set_f( st->totalNoise_increase_hist, 0.f, TOTALNOISE_HIST_SIZE );

    st->totalNoise_increase_len = 0;



#ifdef FIX_920_IGF_INIT_ERROR

    init_coder_ace_plus( st, st->last_total_brate, igf_brate, 0 /* initialization value */ );

#else

    init_coder_ace_plus( st, st->last_total_brate, 0 /* initialization value */ );

#endif



    /*-----------------------------------------------------------------*

     * FD-CNG encoder