<div dir="ltr">Reverting the sa8d_inter changes. This block always uses square CUs, so sa8d primitives are sufficient. <br><br># HG changeset patch<br># User Deepthi Nandakumar <<a href="mailto:deepthi@multicorewareinc.com">deepthi@multicorewareinc.com</a>><br>
# Date 1385631244 -19800<br># Node ID 2ba6c26c9febdc8c57d3014c0cf98d4897d3992d<br># Parent  ca8c57f0c53248a36db6d04639c39ac0e2829fcd<br>RD merge: add in early-skip param.<br><br>diff -r ca8c57f0c532 -r 2ba6c26c9feb source/encoder/compress.cpp<br>
--- a/source/encoder/compress.cpp    Thu Nov 28 13:52:19 2013 +0530<br>+++ b/source/encoder/compress.cpp    Thu Nov 28 15:04:04 2013 +0530<br>@@ -420,7 +420,7 @@<br>             /* Compute  Merge Cost */<br>             xComputeCostMerge2Nx2N(m_bestMergeCU[depth], m_mergeCU[depth], m_modePredYuv[3][depth], m_bestMergeRecoYuv[depth]);<br>
 <br>-            if (!m_bestMergeCU[depth]->isSkipped(0))<br>+            if (!(m_cfg->param.bEnableEarlySkip && m_bestMergeCU[depth]->isSkipped(0)))<br>             {<br>                 /*Compute 2Nx2N mode costs*/<br>
                 {<br><br><div><div id="__tbSetup"></div></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Nov 28, 2013 at 2:54 PM,  <span dir="ltr"><<a href="mailto:deepthi@multicorewareinc.com" target="_blank">deepthi@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 Deepthi Nandakumar <<a href="mailto:deepthi@multicorewareinc.com">deepthi@multicorewareinc.com</a>><br>
# Date 1385630646 -19800<br>
# Node ID 4f0b72baee90e9cf63ab2015b65f3d820c87d129<br>
# Parent  ca8c57f0c53248a36db6d04639c39ac0e2829fcd<br>
RD merge and cost fixes: use sa8d_inter, add early-skip param that was missed in earlier commit.<br>
<br>
diff -r ca8c57f0c532 -r 4f0b72baee90 source/encoder/compress.cpp<br>
--- a/source/encoder/compress.cpp       Thu Nov 28 13:52:19 2013 +0530<br>
+++ b/source/encoder/compress.cpp       Thu Nov 28 14:54:06 2013 +0530<br>
@@ -211,7 +211,7 @@<br>
     outTempCU->m_totalBits = 0;<br>
     m_search->predInterSearch(outTempCU, outPredYuv, bUseMRG, true, false);<br>
     int part = g_convertToBit[outTempCU->getWidth(0)];<br>
-    uint32_t distortion = primitives.sa8d[part](m_origYuv[depth]->getLumaAddr(), m_origYuv[depth]->getStride(),<br>
+    uint32_t distortion = primitives.sa8d_inter[part](m_origYuv[depth]->getLumaAddr(), m_origYuv[depth]->getStride(),<br>
                                                   outPredYuv->getLumaAddr(), outPredYuv->getStride());<br>
     outTempCU->m_totalCost = m_rdCost->calcRdSADCost(distortion, outTempCU->m_totalBits);<br>
 }<br>
@@ -420,7 +420,7 @@<br>
             /* Compute  Merge Cost */<br>
             xComputeCostMerge2Nx2N(m_bestMergeCU[depth], m_mergeCU[depth], m_modePredYuv[3][depth], m_bestMergeRecoYuv[depth]);<br>
<br>
-            if (!m_bestMergeCU[depth]->isSkipped(0))<br>
+            if (!(m_cfg->param.bEnableEarlySkip && m_bestMergeCU[depth]->isSkipped(0)))<br>
             {<br>
                 /*Compute 2Nx2N mode costs*/<br>
                 {<br>
</blockquote></div><br></div>