[x265] [PATCH] bApplyWeight member variable replaced with applyWeight

[Steve Borho]

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

> # HG changeset patch
> # User praveentiwari
> # Date 1373606044 -19800
> # Node ID 0efb77a7ccf599a73013cc7298625d1ff429f679
> # Parent  21ad840817b9ed81c20dee42a1414460abeaaaa4
> bApplyWeight member variable replaced with applyWeight
>

I haven't been removing the b prefix for bools, but this is fine, Queued.


> diff -r 21ad840817b9 -r 0efb77a7ccf5 source/Lib/TLibCommon/TComRdCost.cpp
> --- a/source/Lib/TLibCommon/TComRdCost.cpp      Fri Jul 12 10:31:09 2013
> +0530
> +++ b/source/Lib/TLibCommon/TComRdCost.cpp      Fri Jul 12 10:44:04 2013
> +0530
> @@ -201,7 +201,7 @@
>
>  UInt TComRdCost::xGetSAD(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          return xGetSADw(pcDtParam);
>      }
> @@ -230,7 +230,7 @@
>
>  UInt TComRdCost::xGetSAD4(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          return xGetSADw(pcDtParam);
>      }
> @@ -261,7 +261,7 @@
>
>  UInt TComRdCost::xGetSAD8(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          return xGetSADw(pcDtParam);
>      }
> @@ -296,7 +296,7 @@
>
>  UInt TComRdCost::xGetSAD16(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          return xGetSADw(pcDtParam);
>      }
> @@ -339,7 +339,7 @@
>
>  UInt TComRdCost::xGetSAD12(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          return xGetSADw(pcDtParam);
>      }
> @@ -421,7 +421,7 @@
>
>  UInt TComRdCost::xGetSAD32(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          return xGetSADw(pcDtParam);
>      }
> @@ -480,7 +480,7 @@
>
>  UInt TComRdCost::xGetSAD24(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          return xGetSADw(pcDtParam);
>      }
> @@ -531,7 +531,7 @@
>
>  UInt TComRdCost::xGetSAD64(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          return xGetSADw(pcDtParam);
>      }
> @@ -623,7 +623,7 @@
>
>  UInt TComRdCost::xGetSAD48(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          return xGetSADw(pcDtParam);
>      }
> @@ -724,7 +724,7 @@
>
>  UInt TComRdCost::xGetSSE(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          return xGetSSEw(pcDtParam);
>      }
> @@ -788,7 +788,7 @@
>
>  UInt TComRdCost::xGetSSE4(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          assert(pcDtParam->cols == 4);
>          return xGetSSEw(pcDtParam);
> @@ -860,7 +860,7 @@
>
>  UInt TComRdCost::xGetSSE8(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          assert(pcDtParam->cols == 8);
>          return xGetSSEw(pcDtParam);
> @@ -948,7 +948,7 @@
>
>  UInt TComRdCost::xGetSSE16(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          assert(pcDtParam->cols == 16);
>          return xGetSSEw(pcDtParam);
> @@ -1039,7 +1039,7 @@
>
>  UInt TComRdCost::xGetSSE16N(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          return xGetSSEw(pcDtParam);
>      }
> @@ -1159,7 +1159,7 @@
>
>  UInt TComRdCost::xGetSSE32(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          assert(pcDtParam->cols == 32);
>          return xGetSSEw(pcDtParam);
> @@ -1344,7 +1344,7 @@
>
>  UInt TComRdCost::xGetSSE64(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          assert(pcDtParam->cols == 64);
>          return xGetSSEw(pcDtParam);
> @@ -1581,7 +1581,7 @@
>
>  UInt TComRdCost::xGetHADs4(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          return xGetHADs4w(pcDtParam);
>      }
> @@ -1607,7 +1607,7 @@
>
>  UInt TComRdCost::xGetHADs8(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          return xGetHADs8w(pcDtParam);
>      }
> @@ -1643,7 +1643,7 @@
>
>  UInt TComRdCost::xGetHADs(DistParam* pcDtParam)
>  {
> -    if (pcDtParam->bApplyWeight)
> +    if (pcDtParam->applyWeight)
>      {
>          return xGetHADsw(pcDtParam);
>      }
> diff -r 21ad840817b9 -r 0efb77a7ccf5 source/Lib/TLibCommon/TComRdCost.h
> --- a/source/Lib/TLibCommon/TComRdCost.h        Fri Jul 12 10:31:09 2013
> +0530
> +++ b/source/Lib/TLibCommon/TComRdCost.h        Fri Jul 12 10:44:04 2013
> +0530
> @@ -123,7 +123,7 @@
>      FpDistFunc distFunc;
>      Int   bitDepth;
>
> -    Bool            bApplyWeight;   // whether weighted prediction is
> used or not
> +    Bool            applyWeight;   // whether weighted prediction is used
> or not
>      wpScalingParam  *wpCur;         // weighted prediction scaling
> parameters for current ref
>
>      // (vertical) subsampling shift (for reducing complexity)
> diff -r 21ad840817b9 -r 0efb77a7ccf5 source/Lib/TLibEncoder/TEncSearch.cpp
> --- a/source/Lib/TLibEncoder/TEncSearch.cpp     Fri Jul 12 10:31:09 2013
> +0530
> +++ b/source/Lib/TLibEncoder/TEncSearch.cpp     Fri Jul 12 10:44:04 2013
> +0530
> @@ -4962,15 +4962,15 @@
>  {
>      if (refIfx < 0)
>      {
> -        m_distParam.bApplyWeight = false;
> +        m_distParam.applyWeight = false;
>          return;
>      }
>
>      TComSlice       *slice = cu->getSlice();
>      TComPPS         *pps   = cu->getSlice()->getPPS();
>      wpScalingParam  *wp0, *wp1;
> -    m_distParam.bApplyWeight = (slice->getSliceType() == P_SLICE &&
> pps->getUseWP()) || (slice->getSliceType() == B_SLICE &&
> pps->getWPBiPred());
> -    if (!m_distParam.bApplyWeight) return;
> +    m_distParam.applyWeight = (slice->getSliceType() == P_SLICE &&
> pps->getUseWP()) || (slice->getSliceType() == B_SLICE &&
> pps->getWPBiPred());
> +    if (!m_distParam.applyWeight) return;
>
>      Int refIdx0 = (picList == REF_PIC_LIST_0) ? refIfx : (-1);
>      Int refIdx1 = (picList == REF_PIC_LIST_1) ? refIfx : (-1);
> _______________________________________________
> 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/69d4d7b5/attachment.html>