Commit c0b89498 authored by multrus's avatar multrus
Browse files

cleanup

parent fcbc6192

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ 
//#define HARM_SCE_INIT

#define DIV32_OPT_NEWTON                               /* FhG: faster 32 by 32 bit division */ 

#define	MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of Cy calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Obsoletes IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE. */

#define FIX_1481_HARDCODE_DIV                          /* FhG: hardcode division results in stereo_dmx_evs_init_encoder_fx() */



#define TEST_HR

lib_enc/ivas_stereo_dmx_evs_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -2419,7 +2419,7 @@ ivas_error stereo_dmx_evs_init_encoder_fx( 


    fad_g = hStereoDmxEVS->hPHA->fad_g_fx;

    // fad_r = 1.0f / (float) ( fad_len + 1 );

#if 1

#ifdef FIX_1481_HARDCODE_DIV

    SWITCH( fad_len )

    {

        case STEREO_DMX_EVS_FAD_LEN_16:
@@ -2564,7 +2564,7 @@ ivas_error stereo_dmx_evs_init_encoder_fx( 
    move16();

    fad_g = hStereoDmxEVS->hPHA->fad_g_prc_fx;

    // fad_r = 1.0f / (float) ( fad_len + 1 );

#if 1

#ifdef FIX_1481_HARDCODE_DIV

    SWITCH( fad_len )

    {

        case STEREO_DMX_EVS_FADE_LEN_PRC_Q0 * 16: