Commit df1432b0 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_BASOP_2573_RF_MODE_UPDATE

parent 88de5911

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_BASOP_2573_RF_MODE_UPDATE                   /* FhG: BASOP issue 2573: remove duplicated update of rf_mode parameters from evs_enc_fx(); was already done in updt_enc_common_fx() */

#define FIX_2570_BUF_OVFL                               /* Orange: basop issue 2570: global-buffer-overflow in lib_rend/ivas_objectRenderer_sources_fx.c */

#define FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT        /* Dolby: float issue 1550: Wrong render framesize printout */

#define HARMONIZE_2553_TonalConceal_Apply               /* FhG: Harmonize TonalMDCTConceal_Apply with its ivas derivate */

lib_enc/evs_enc_fx.c

+0 −27
Original line number Diff line number Diff line
@@ -76,16 +76,10 @@ ivas_error evs_enc_fx( 
    Word16 pitch_orig[3]; /* original open-loop pitch values that might be altered in core_acelp_tcx20_switching_fx() within MODE2 */

#endif

    ivas_error error;

#ifndef FIX_BASOP_2573_RF_MODE_UPDATE

    SC_VBR_ENC_HANDLE hSC_VBR = st->hSC_VBR;

#endif

    TD_CNG_ENC_HANDLE hTdCngEnc = st->hTdCngEnc;

    LPD_state_HANDLE hLPDmem = st->hLPDmem;

    TD_BWE_ENC_HANDLE hBWE_TD = st->hBWE_TD;

    BSTR_ENC_HANDLE hBstr = st->hBstr;

#ifndef FIX_BASOP_2573_RF_MODE_UPDATE

    RF_ENC_HANDLE hRF = st->hRF;

#endif



    error = IVAS_ERR_OK;
@@ -585,27 +579,6 @@ ivas_error evs_enc_fx( 
        move16();

    }



#ifndef FIX_BASOP_2573_RF_MODE_UPDATE

    IF( EQ_16( st->rf_mode, 1 ) )

    {

        IF( EQ_16( hRF->rf_frame_type, RF_NELP ) )

        {

            hSC_VBR->last_nelp_mode = 1;

        }

        ELSE

        {

            hSC_VBR->last_nelp_mode = 0;

        }

    }



    /* RF mode updates */

    st->rf_mode_last = st->rf_mode;

    IF( EQ_16( st->Opt_RF_ON, 1 ) )

    {

        st->L_frame = L_FRAME;

        st->rf_mode = 1;

    }

#endif

#ifdef DEBUG_MODE_INFO

    dbgwrite( &st->codec_mode, sizeof( short ), 1, input_frame, "res/codec" );

    dbgwrite( &st->core, sizeof( short ), 1, input_frame, "res/core" );