<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">On Wed, Oct 31, 2018 at 6:00 PM <<a href="mailto:praveen@multicorewareinc.com">praveen@multicorewareinc.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User Praveen Tiwari <<a href="mailto:praveen@multicorewareinc.com" target="_blank">praveen@multicorewareinc.com</a>><br>
# Date 1540983948 -19800<br>
# Wed Oct 31 16:35:48 2018 +0530<br>
# Node ID f0d02ca443adf8ff90ed61552d35347ff51c8e90<br>
# Parent fd517ae68f93dbfdd1bff45a9dd8e626523542b6<br>
fix Issue #442: linking issue on non x86 platform<br>
<br>
diff -r fd517ae68f93 -r f0d02ca443ad source/common/cpu.cpp<br>
--- a/source/common/cpu.cpp Tue Sep 25 16:02:31 2018 +0530<br>
+++ b/source/common/cpu.cpp Wed Oct 31 16:35:48 2018 +0530<br>
@@ -127,6 +127,7 @@<br>
{<br>
return(enable512);<br>
}<br>
+<br>
uint32_t cpu_detect(bool benableavx512 )<br>
{<br>
<br>
diff -r fd517ae68f93 -r f0d02ca443ad source/common/quant.cpp<br>
--- a/source/common/quant.cpp Tue Sep 25 16:02:31 2018 +0530<br>
+++ b/source/common/quant.cpp Wed Oct 31 16:35:48 2018 +0530<br>
@@ -723,6 +723,7 @@<br>
X265_CHECK(coeffNum[cgScanPos] == 0, "count of coeff failure\n");<br>
uint32_t scanPosBase = (cgScanPos << MLS_CG_SIZE);<br>
uint32_t blkPos = codeParams.scan[scanPosBase];<br>
+#if X265_ARCH_X86<br>
bool enable512 = detect512();<br>
if (enable512)<br>
<a href="http://primitives.cu" rel="noreferrer" target="_blank">primitives.cu</a>[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);<br>
@@ -731,6 +732,10 @@<br>
<a href="http://primitives.cu" rel="noreferrer" target="_blank">primitives.cu</a>[log2TrSize - 2].psyRdoQuant_1p(m_resiDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost,blkPos);<br>
<a href="http://primitives.cu" rel="noreferrer" target="_blank">primitives.cu</a>[log2TrSize - 2].psyRdoQuant_2p(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);<br>
}<br>
+#else<br>
+ <a href="http://primitives.cu" rel="noreferrer" target="_blank">primitives.cu</a>[log2TrSize - 2].psyRdoQuant_1p(m_resiDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, blkPos);<br>
+ <a href="http://primitives.cu" rel="noreferrer" target="_blank">primitives.cu</a>[log2TrSize - 2].psyRdoQuant_2p(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);<br>
+#endif<br>
}<br>
}<br>
else<br>
@@ -805,8 +810,8 @@<br>
uint32_t blkPos = codeParams.scan[scanPosBase];<br>
if (usePsyMask)<br>
{<br>
+#if X265_ARCH_X86<br>
bool enable512 = detect512();<br>
-<br>
if (enable512)<br>
<a href="http://primitives.cu" rel="noreferrer" target="_blank">primitives.cu</a>[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);<br>
else<br>
@@ -814,6 +819,10 @@<br>
<a href="http://primitives.cu" rel="noreferrer" target="_blank">primitives.cu</a>[log2TrSize - 2].psyRdoQuant_1p(m_resiDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, blkPos);<br>
<a href="http://primitives.cu" rel="noreferrer" target="_blank">primitives.cu</a>[log2TrSize - 2].psyRdoQuant_2p(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);<br>
}<br>
+#else<br>
+ <a href="http://primitives.cu" rel="noreferrer" target="_blank">primitives.cu</a>[log2TrSize - 2].psyRdoQuant_1p(m_resiDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, blkPos);<br>
+ <a href="http://primitives.cu" rel="noreferrer" target="_blank">primitives.cu</a>[log2TrSize - 2].psyRdoQuant_2p(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);<br>
+#endif<br>
blkPos = codeParams.scan[scanPosBase];<br>
for (int y = 0; y < MLS_CG_SIZE; y++)<br>
{<br>
_______________________________________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org" target="_blank">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a></blockquote><div><br></div><div>Pushed to stable. </div></div></div>