Commit 4a865300 authored by multrus's avatar multrus
Browse files

[cleanup] remove inactive //#define HARM_SCE_INIT

parent 468f229f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ 
#define OPT_BIN_REND_V2_NBE

/* Both following 2 macros (IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST*) are independent from each other, they refer to different code blocks */

//#define IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE /* FhG: reduces WMOPS of param_mc_prm_est, not bit-exact to previous version. Obsoleted by MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE. */

//#define HARM_SCE_INIT

#define MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of dmx calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Requires MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE. */

lib_enc/ivas_init_enc_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -558,19 +558,11 @@ ivas_error ivas_init_encoder_fx( 
        move16();

        sce_id = 0;

        move16();

#ifndef HARM_SCE_INIT

        test();

        IF( NE_32( ( error = create_evs_sce_enc_fx( st_ivas, sce_id, ivas_total_brate ) ), IVAS_ERR_OK ) )

        {

            return error;

        }

#else

        test();

        IF( NE_32( ( error = create_sce_enc_fx( st_ivas, sce_id, ivas_total_brate ) ), IVAS_ERR_OK ) )

        {

            return error;

        }

#endif

        /* prepare stereo downmix for EVS */

        IF( EQ_16( hEncoderConfig->stereo_dmx_evs, 1 ) )

        {

lib_enc/ivas_sce_enc_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -490,7 +490,6 @@ ivas_error create_sce_enc_fx( 
 *

 * Create, allocate and initialize EVS encoder SCE handle

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

#ifndef HARM_SCE_INIT

ivas_error create_evs_sce_enc_fx(

    Encoder_Struct *st_ivas,   /* i/o: IVAS encoder structure      */

    const Word16 sce_id,       /* i  : SCE # identifier            */
@@ -632,7 +631,6 @@ ivas_error create_evs_sce_enc_fx( 


    return error;

}

#endif

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

 * destroy_sce_enc_fx()

 *