Commit b8d786b7 authored by malenov's avatar malenov
Browse files

remove FIX_1049_SHR_RO_COMPLEXITY and FIX_1052_COPY_CMPLX_DISCREPANCY

parent 3d511700

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -78,8 +78,6 @@ 
#define NON_BE_FIX_807_MASA_DTX_BRSW                    /* Nokia: adds fix to check existence of DTX encoder for secondary channel in TD mode */

#define FIX_BASOP_812_NAN_COHSNR                        /* FhG: BASOP issue 812: fix nan values in sparse frames for cohSNR value in ITD estimation*/

#define FIX_828_PORT_1152_FROM_FLT_REPO                 /* FhG: fix for issue 828 - fix uninitialized value used in BASOP */

#define FIX_1049_SHR_RO_COMPLEXITY                      /* VA: fix for issue 1049: incorrect counting of complexity in the shr_ro() function */

#define FIX_1052_COPY_CMPLX_DISCREPANCY                 /* fix IF-ELSE discpreancy within the Copy() function depending on memory locations of x[] and y[] */



/* #################### End FIXES switches ############################ */

lib_com/tools_fx.c

+0 −20
Original line number Diff line number Diff line
@@ -488,12 +488,7 @@ void Copy( 
            move16();

        }

    }



#ifdef FIX_1052_COPY_CMPLX_DISCREPANCY

    IF( y >= x )

#else

    ELSE

#endif

    {

        FOR( i = L - 1; i >= 0; i-- )

        {
@@ -522,12 +517,7 @@ void Copy64( 
            move64();

        }

    }



#ifdef FIX_1052_COPY_CMPLX_DISCREPANCY

    IF( y >= x )

#else

    ELSE

#endif

    {

        FOR( i = L - 1; i >= 0; i-- )

        {
@@ -571,12 +561,7 @@ void Copy_pword( 
            move16();

        }

    }



#ifdef FIX_1052_COPY_CMPLX_DISCREPANCY

    IF( y >= x )

#else

    ELSE

#endif

    {

        FOR( i = L - 1; i >= 0; i-- )

        {
@@ -607,12 +592,7 @@ void Copy32( 
            move32();

        }

    }



#ifdef FIX_1052_COPY_CMPLX_DISCREPANCY

    IF( y >= x )

#else

    ELSE

#endif

    {

        FOR( i = L - 1; i >= 0; i-- )

        {