<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Jul 12, 2013 at 12:14 AM, <span dir="ltr"><<a href="mailto:praveen@multicorewareinc.com" target="_blank">praveen@multicorewareinc.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User praveentiwari<br>
# Date 1373606044 -19800<br>
# Node ID 0efb77a7ccf599a73013cc7298625d1ff429f679<br>
# Parent 21ad840817b9ed81c20dee42a1414460abeaaaa4<br>
bApplyWeight member variable replaced with applyWeight<br></blockquote><div><br></div><div>I haven't been removing the b prefix for bools, but this is fine, Queued.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
diff -r 21ad840817b9 -r 0efb77a7ccf5 source/Lib/TLibCommon/TComRdCost.cpp<br>
--- a/source/Lib/TLibCommon/TComRdCost.cpp Fri Jul 12 10:31:09 2013 +0530<br>
+++ b/source/Lib/TLibCommon/TComRdCost.cpp Fri Jul 12 10:44:04 2013 +0530<br>
@@ -201,7 +201,7 @@<br>
<br>
UInt TComRdCost::xGetSAD(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
return xGetSADw(pcDtParam);<br>
}<br>
@@ -230,7 +230,7 @@<br>
<br>
UInt TComRdCost::xGetSAD4(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
return xGetSADw(pcDtParam);<br>
}<br>
@@ -261,7 +261,7 @@<br>
<br>
UInt TComRdCost::xGetSAD8(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
return xGetSADw(pcDtParam);<br>
}<br>
@@ -296,7 +296,7 @@<br>
<br>
UInt TComRdCost::xGetSAD16(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
return xGetSADw(pcDtParam);<br>
}<br>
@@ -339,7 +339,7 @@<br>
<br>
UInt TComRdCost::xGetSAD12(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
return xGetSADw(pcDtParam);<br>
}<br>
@@ -421,7 +421,7 @@<br>
<br>
UInt TComRdCost::xGetSAD32(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
return xGetSADw(pcDtParam);<br>
}<br>
@@ -480,7 +480,7 @@<br>
<br>
UInt TComRdCost::xGetSAD24(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
return xGetSADw(pcDtParam);<br>
}<br>
@@ -531,7 +531,7 @@<br>
<br>
UInt TComRdCost::xGetSAD64(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
return xGetSADw(pcDtParam);<br>
}<br>
@@ -623,7 +623,7 @@<br>
<br>
UInt TComRdCost::xGetSAD48(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
return xGetSADw(pcDtParam);<br>
}<br>
@@ -724,7 +724,7 @@<br>
<br>
UInt TComRdCost::xGetSSE(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
return xGetSSEw(pcDtParam);<br>
}<br>
@@ -788,7 +788,7 @@<br>
<br>
UInt TComRdCost::xGetSSE4(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
assert(pcDtParam->cols == 4);<br>
return xGetSSEw(pcDtParam);<br>
@@ -860,7 +860,7 @@<br>
<br>
UInt TComRdCost::xGetSSE8(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
assert(pcDtParam->cols == 8);<br>
return xGetSSEw(pcDtParam);<br>
@@ -948,7 +948,7 @@<br>
<br>
UInt TComRdCost::xGetSSE16(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
assert(pcDtParam->cols == 16);<br>
return xGetSSEw(pcDtParam);<br>
@@ -1039,7 +1039,7 @@<br>
<br>
UInt TComRdCost::xGetSSE16N(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
return xGetSSEw(pcDtParam);<br>
}<br>
@@ -1159,7 +1159,7 @@<br>
<br>
UInt TComRdCost::xGetSSE32(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
assert(pcDtParam->cols == 32);<br>
return xGetSSEw(pcDtParam);<br>
@@ -1344,7 +1344,7 @@<br>
<br>
UInt TComRdCost::xGetSSE64(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
assert(pcDtParam->cols == 64);<br>
return xGetSSEw(pcDtParam);<br>
@@ -1581,7 +1581,7 @@<br>
<br>
UInt TComRdCost::xGetHADs4(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
return xGetHADs4w(pcDtParam);<br>
}<br>
@@ -1607,7 +1607,7 @@<br>
<br>
UInt TComRdCost::xGetHADs8(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
return xGetHADs8w(pcDtParam);<br>
}<br>
@@ -1643,7 +1643,7 @@<br>
<br>
UInt TComRdCost::xGetHADs(DistParam* pcDtParam)<br>
{<br>
- if (pcDtParam->bApplyWeight)<br>
+ if (pcDtParam->applyWeight)<br>
{<br>
return xGetHADsw(pcDtParam);<br>
}<br>
diff -r 21ad840817b9 -r 0efb77a7ccf5 source/Lib/TLibCommon/TComRdCost.h<br>
--- a/source/Lib/TLibCommon/TComRdCost.h Fri Jul 12 10:31:09 2013 +0530<br>
+++ b/source/Lib/TLibCommon/TComRdCost.h Fri Jul 12 10:44:04 2013 +0530<br>
@@ -123,7 +123,7 @@<br>
FpDistFunc distFunc;<br>
Int bitDepth;<br>
<br>
- Bool bApplyWeight; // whether weighted prediction is used or not<br>
+ Bool applyWeight; // whether weighted prediction is used or not<br>
wpScalingParam *wpCur; // weighted prediction scaling parameters for current ref<br>
<br>
// (vertical) subsampling shift (for reducing complexity)<br>
diff -r 21ad840817b9 -r 0efb77a7ccf5 source/Lib/TLibEncoder/TEncSearch.cpp<br>
--- a/source/Lib/TLibEncoder/TEncSearch.cpp Fri Jul 12 10:31:09 2013 +0530<br>
+++ b/source/Lib/TLibEncoder/TEncSearch.cpp Fri Jul 12 10:44:04 2013 +0530<br>
@@ -4962,15 +4962,15 @@<br>
{<br>
if (refIfx < 0)<br>
{<br>
- m_distParam.bApplyWeight = false;<br>
+ m_distParam.applyWeight = false;<br>
return;<br>
}<br>
<br>
TComSlice *slice = cu->getSlice();<br>
TComPPS *pps = cu->getSlice()->getPPS();<br>
wpScalingParam *wp0, *wp1;<br>
- m_distParam.bApplyWeight = (slice->getSliceType() == P_SLICE && pps->getUseWP()) || (slice->getSliceType() == B_SLICE && pps->getWPBiPred());<br>
- if (!m_distParam.bApplyWeight) return;<br>
+ m_distParam.applyWeight = (slice->getSliceType() == P_SLICE && pps->getUseWP()) || (slice->getSliceType() == B_SLICE && pps->getWPBiPred());<br>
+ if (!m_distParam.applyWeight) return;<br>
<br>
Int refIdx0 = (picList == REF_PIC_LIST_0) ? refIfx : (-1);<br>
Int refIdx1 = (picList == REF_PIC_LIST_1) ? refIfx : (-1);<br>
_______________________________________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
<a href="http://mailman.videolan.org/listinfo/x265-devel" target="_blank">http://mailman.videolan.org/listinfo/x265-devel</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Steve Borho
</div></div>