Commit bd6cae01 authored by malenov's avatar malenov
Browse files

cleanup

parent a1e7d489

lib_com/enh1632.c

+2 −2
Original line number Diff line number Diff line
@@ -392,14 +392,14 @@ Word16 shl_ro( Word16 var1, Word16 var2, Flag *Overflow ) 
        var2 = -var2;

        var_out = shr_ro( var1, var2, Overflow );

#ifdef WMOPS

#ifndef FIX_SHR_RO_COMPLEXITY

#ifndef FIX_1049_SHR_RO_COMPLEXITY

        multiCounter[currCounter].shr_r--;

#endif

#endif /* ifdef WMOPS */

    }



#ifdef WMOPS

#ifndef FIX_SHR_RO_COMPLEXITY

#ifndef FIX_1049_SHR_RO_COMPLEXITY

    multiCounter[currCounter].shl_r++;

#endif

#endif /* ifdef WMOPS */

lib_com/options.h

+4 −4
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ 
#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_SHR_RO_COMPLEXITY                           /* VA: fix for issue 1049: incorrect counting of complexity in the shr_ro() function */

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

#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

+4 −4
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ void Copy( 
        }

    }



#ifdef FIX_IF_ELSE_CMPLX_DISCREPANCY

#ifdef FIX_1052_COPY_CMPLX_DISCREPANCY

    IF( y >= x )

#else

    ELSE
@@ -523,7 +523,7 @@ void Copy64( 
        }

    }



#ifdef FIX_IF_ELSE_CMPLX_DISCREPANCY

#ifdef FIX_1052_COPY_CMPLX_DISCREPANCY

    IF( y >= x )

#else

    ELSE
@@ -572,7 +572,7 @@ void Copy_pword( 
        }

    }



#ifdef FIX_IF_ELSE_CMPLX_DISCREPANCY

#ifdef FIX_1052_COPY_CMPLX_DISCREPANCY

    IF( y >= x )

#else

    ELSE
@@ -608,7 +608,7 @@ void Copy32( 
        }

    }



#ifdef FIX_IF_ELSE_CMPLX_DISCREPANCY

#ifdef FIX_1052_COPY_CMPLX_DISCREPANCY

    IF( y >= x )

#else

    ELSE