<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Sun, Oct 27, 2013 at 5:23 PM, Wenju He <span dir="ltr"><<a href="mailto:wenju@multicorewareinc.com" target="_blank">wenju@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 Wenju He <<a href="mailto:wenju@multicorewareinc.com">wenju@multicorewareinc.com</a>><br>
# Date 1382911597 18000<br>
# Sun Oct 27 17:06:37 2013 -0500<br>
# Node ID e1453bc3ae1e6b882762ce7205298e8983c35c67<br>
# Parent ccac3a7d3622b7326443745c1ecae0e2edd3e539<br>
fix variable name, msg to mrg<br></blockquote><div><br></div><div>both of these are queued for default, thanks</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
diff -r ccac3a7d3622 -r e1453bc3ae1e source/Lib/TLibEncoder/TEncSearch.cpp<br>
--- a/source/Lib/TLibEncoder/TEncSearch.cpp Fri Oct 25 22:40:09 2013 -0500<br>
+++ b/source/Lib/TLibEncoder/TEncSearch.cpp Sun Oct 27 17:06:37 2013 -0500<br>
@@ -2473,9 +2473,9 @@<br>
<br>
if (cu->getPartitionSize(partAddr) != SIZE_2Nx2N)<br>
{<br>
- UInt msgInterDir = 0;<br>
+ UInt mrgInterDir = 0;<br>
TComMvField mrgMvField[2];<br>
- UInt msgIndex = 0;<br>
+ UInt mrgIndex = 0;<br>
<br>
UInt meInterDir = 0;<br>
TComMvField meMvField[2];<br>
@@ -2497,13 +2497,13 @@<br>
<br>
// find Merge result<br>
UInt mrgCost = MAX_UINT;<br>
- xMergeEstimation(cu, partIdx, msgInterDir, mrgMvField, msgIndex, mrgCost, mvFieldNeighbours, interDirNeighbours, numValidMergeCand);<br>
+ xMergeEstimation(cu, partIdx, mrgInterDir, mrgMvField, mrgIndex, mrgCost, mvFieldNeighbours, interDirNeighbours, numValidMergeCand);<br>
if (mrgCost < meCost)<br>
{<br>
// set Merge result<br>
cu->setMergeFlagSubParts(true, partAddr, partIdx, cu->getDepth(partAddr));<br>
- cu->setMergeIndexSubParts(msgIndex, partAddr, partIdx, cu->getDepth(partAddr));<br>
- cu->setInterDirSubParts(msgInterDir, partAddr, partIdx, cu->getDepth(partAddr));<br>
+ cu->setMergeIndexSubParts(mrgIndex, partAddr, partIdx, cu->getDepth(partAddr));<br>
+ cu->setInterDirSubParts(mrgInterDir, partAddr, partIdx, cu->getDepth(partAddr));<br>
{<br>
cu->getCUMvField(REF_PIC_LIST_0)->setAllMvField(mrgMvField[0], partSize, partAddr, 0, partIdx);<br>
cu->getCUMvField(REF_PIC_LIST_1)->setAllMvField(mrgMvField[1], partSize, partAddr, 0, partIdx);<br>
_______________________________________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Steve Borho
</div></div>