[x265] [PATCH] TComRdCost::xGetSSE32 cleanup

[Steve Borho]

On Fri, Jul 12, 2013 at 6:02 AM, <praveen at multicorewareinc.com> wrote:

> # HG changeset patch
> # User praveentiwari
> # Date 1373626970 -19800
> # Node ID 0ae84c4ad796445eaaaf125298c679ea1ac7284f
> # Parent  4dd127bfafdc3ec3a5a01db18ca51c8cc7210234
> TComRdCost::xGetSSE32 cleanup
>

All pushed, thanks.  In the future, if you have a dozen commits that are
all simple/cleanup types you can push them to a bitbucket fork and make me
a reader and send a pull request.  These types of cleanups don't need to go
through the list.



> diff -r 4dd127bfafdc -r 0ae84c4ad796 source/Lib/TLibCommon/TComRdCost.cpp
> --- a/source/Lib/TLibCommon/TComRdCost.cpp      Fri Jul 12 16:23:18 2013
> +0530
> +++ b/source/Lib/TLibCommon/TComRdCost.cpp      Fri Jul 12 16:32:50 2013
> +0530
> @@ -1157,45 +1157,45 @@
>      return sum;
>  }
>
> -UInt TComRdCost::xGetSSE32(DistParam* pcDtParam)
> +UInt TComRdCost::xGetSSE32(DistParam* distParam)
>  {
> -    if (pcDtParam->applyWeight)
> +    if (distParam->applyWeight)
>      {
> -        assert(pcDtParam->cols == 32);
> -        return xGetSSEw(pcDtParam);
> +        assert(distParam->cols == 32);
> +        return xGetSSEw(distParam);
>      }
> -    Pel* piOrg   = pcDtParam->fenc;
> -    Pel* piCur   = pcDtParam->fref;
> -    Int  iRows   = pcDtParam->rows;
> -    Int  iStrideOrg = pcDtParam->fencstride;
> -    Int  iStrideCur = pcDtParam->frefstride;
> +    Pel* org = distParam->fenc;
> +    Pel* cur = distParam->fref;
> +    Int  rows = distParam->rows;
> +    Int  strideOrg = distParam->fencstride;
> +    Int  strideCur = distParam->frefstride;
>
> -    UInt uiSum = 0;
> -    UInt uiShift = DISTORTION_PRECISION_ADJUSTMENT((pcDtParam->bitDepth -
> 8) << 1);
> +    UInt sum = 0;
> +    UInt shift = DISTORTION_PRECISION_ADJUSTMENT((distParam->bitDepth -
> 8) << 1);
>
> -    if ((sizeof(Pel) == 2) || ((piOrg != NULL) && (piCur != NULL)))
> +    if ((sizeof(Pel) == 2) || ((org != NULL) && (cur != NULL)))
>      {
> -        uiSum = xGetSSE32Help<Pel, Pel>(piOrg, iStrideOrg, piCur,
> iStrideCur, iRows, uiShift);
> +        sum = xGetSSE32Help<Pel, Pel>(org, strideOrg, cur, strideCur,
> rows, shift);
>      }
>      else
>      {
> -        Short* piOrg_s;
> -        Short* piCur_s;
> -        DistParamSSE* DtParam =
> reinterpret_cast<DistParamSSE*>(pcDtParam);
> -        piOrg_s = DtParam->ptr1;
> -        piCur_s = DtParam->ptr2;
> +        Short* org_s;
> +        Short* cur_s;
> +        DistParamSSE* dtParam =
> reinterpret_cast<DistParamSSE*>(distParam);
> +        org_s = dtParam->ptr1;
> +        cur_s = dtParam->ptr2;
>
> -        if ((piOrg == NULL) && (piCur == NULL))
> +        if ((org == NULL) && (cur == NULL))
>          {
> -            uiSum = xGetSSE32Help<Short, Short>(piOrg_s, iStrideOrg,
> piCur_s, iStrideCur, iRows, uiShift);
> +            sum = xGetSSE32Help<Short, Short>(org_s, strideOrg, cur_s,
> strideCur, rows, shift);
>          }
>          else
>          {
> -            uiSum = xGetSSE32Help<Short, Pel>(piOrg_s, iStrideOrg, piCur,
> iStrideCur, iRows, uiShift);
> +            sum = xGetSSE32Help<Short, Pel>(org_s, strideOrg, cur,
> strideCur, rows, shift);
>          }
>      }
>
> -    return uiSum;
> +    return sum;
>  }
>
>  template<typename T1, typename T2>
> _______________________________________________
> x265-devel mailing list
> x265-devel at videolan.org
> http://mailman.videolan.org/listinfo/x265-devel
>



-- 
Steve Borho
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20130712/6543baf9/attachment-0001.html>