Commit 2b7e131c authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_EFAP_MATH

parent 976f7fb6
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@
/*#define ITD_WINNER_GAIN_MODIFY */                     /* ITD optimization - WORK IN PROGRESS */
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */
#define FIX_I1_113                                      /* under review : MCT bit distribution optimization for SBA high bitrates*/
#define FIX_EFAP_MATH                                   /* fix for EFAP: remove angle quantization and a bug in polygon lookup causing incorrect gains. minor tweak for ALLRAD. non-BE for modes using EFAP */
#define FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS              /* Issue 124: do not allocate unused plc struct in IVAS modes which is only used in EVS mono */
#define FIX_MCT_PLC_RECOVERY                            /* Issue 184: scale the old synthesis part correctly in the first good frame after lost frames in MCT modes - to be activated after previous switch is merged */
#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/
+0 −14
Original line number Diff line number Diff line
@@ -1324,21 +1324,11 @@ static void efap_panning(
    float tmpBuff[EFAP_MAX_CHAN_NUM];
    float normTmpBuff;
    float P[2];
#ifndef FIX_EFAP_MATH
    float P_tmp[2];
#endif

    P[0] = azi;
    P[1] = ele;

    /* Finding in which polygon the point is */
#ifndef FIX_EFAP_MATH
    P_tmp[0] = roundf( P[0] / PANNING_AZI_RESOLUTION );
    P_tmp[1] = roundf( P[1] / PANNING_ELE_RESOLUTION );

    P[0] = P_tmp[0] * PANNING_AZI_RESOLUTION;
    P[1] = P_tmp[1] * PANNING_ELE_RESOLUTION;
#endif

    polyIdx = get_poly_num( P, polyData );

@@ -2260,11 +2250,7 @@ static int16_t in_tri(
    /* Verification of the non-colinearity */
    invFactor = tmpDot1[0] * tmpDot2[1] - tmpDot1[1] * tmpDot2[0];

#ifdef FIX_EFAP_MATH
    if ( fabsf( invFactor ) < thresh )
#else
    if ( invFactor < thresh )
#endif
    {
        return 0;
    }