<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Jul 12, 2013 at 12:37 PM, <span dir="ltr"><<a href="mailto:mahesh@multicorewareinc.com" target="_blank">mahesh@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 maheshpittala<br>
# Date 1373650511 25200<br>
# Node ID 78a1edffd5af804aa991403bd9e869835d801f9b<br>
# Parent a1b29fa01efbb58449452e2e8f7b6dedfcafcfa2<br>
Fix Build Errors for HIGH_BIT_DEPTH enable<br></blockquote><div><br></div><div>coding style issues fixed and pushed, thanks</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
diff -r a1b29fa01efb -r 78a1edffd5af source/Lib/TLibCommon/TComWeightPrediction.cpp<br>
--- a/source/Lib/TLibCommon/TComWeightPrediction.cpp Thu Jul 11 22:32:42 2013 -0500<br>
+++ b/source/Lib/TLibCommon/TComWeightPrediction.cpp Fri Jul 12 10:35:11 2013 -0700<br>
@@ -423,7 +423,7 @@<br>
UInt srcStride = srcYuv0->width;<br>
UInt dstStride = outDstYuv->getStride();<br>
<br>
- x265::primitives.weightpUni(pSrcY0, dstY, srcStride, dstStride, width, height, w0, round, shift, offset, g_bitDepthY);<br>
+ x265::primitives.weightpUni((short *)pSrcY0, (pixel *)dstY, srcStride, dstStride, width, height, w0, round, shift, offset, g_bitDepthY);<br>
<br>
// Chroma U : --------------------------------------------<br>
w0 = wp0[1].w;<br>
@@ -438,7 +438,7 @@<br>
width >>= 1;<br>
height >>= 1;<br>
<br>
- x265::primitives.weightpUni(pSrcU0, dstU, srcStride, dstStride, width, height, w0, round, shift, offset, g_bitDepthC);<br>
+ x265::primitives.weightpUni((short *)pSrcU0, (pixel *)dstU, srcStride, dstStride, width, height, w0, round, shift, offset, g_bitDepthC);<br>
<br>
// Chroma V : --------------------------------------------<br>
w0 = wp0[2].w;<br>
@@ -446,7 +446,7 @@<br>
shift = wp0[2].shift + shiftNum;<br>
round = shift ? (1 << (shift - 1)) : 0;<br>
<br>
- x265::primitives.weightpUni(pSrcU0, dstV, srcStride, dstStride, width, height, w0, round, shift, offset, g_bitDepthC);<br>
+ x265::primitives.weightpUni((short *)pSrcU0, (pixel *)dstV, srcStride, dstStride, width, height, w0, round, shift, offset, g_bitDepthC);<br>
<br>
}<br>
<br>
diff -r a1b29fa01efb -r 78a1edffd5af source/Lib/TLibEncoder/TEncSearch.cpp<br>
--- a/source/Lib/TLibEncoder/TEncSearch.cpp Thu Jul 11 22:32:42 2013 -0500<br>
+++ b/source/Lib/TLibEncoder/TEncSearch.cpp Fri Jul 12 10:35:11 2013 -0700<br>
@@ -1374,7 +1374,7 @@<br>
UInt srcstride = m_qtTempTComYuv[qtLayer].width;<br>
Pel* dst = cu->getPic()->getPicYuvRec()->getLumaAddr(cu->getAddr(), zorder);<br>
UInt dststride = cu->getPic()->getPicYuvRec()->getStride();<br>
- x265::primitives.blockcpy_ps(width, height, dst, dststride, src, srcstride);<br>
+ x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)dst, dststride, src, srcstride);<br>
<br>
if (!bLumaOnly)<br>
{<br>
@@ -1384,11 +1384,11 @@<br>
srcstride = m_qtTempTComYuv[qtLayer].Cwidth;<br>
dst = cu->getPic()->getPicYuvRec()->getCbAddr(cu->getAddr(), zorder);<br>
dststride = cu->getPic()->getPicYuvRec()->getCStride();<br>
- x265::primitives.blockcpy_ps(width, height, dst, dststride, src, srcstride);<br>
+ x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)dst, dststride, src, srcstride);<br>
<br>
src = m_qtTempTComYuv[qtLayer].getCrAddr(absPartIdx);<br>
dst = cu->getPic()->getPicYuvRec()->getCrAddr(cu->getAddr(), zorder);<br>
- x265::primitives.blockcpy_ps(width, height, dst, dststride, src, srcstride);<br>
+ x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)dst, dststride, src, srcstride);<br>
}<br>
}<br>
<br>
@@ -1587,7 +1587,7 @@<br>
UInt reconQtStride = m_qtTempTComYuv[qtlayer].width;<br>
UInt width = cu->getWidth(0) >> trDepth;<br>
UInt height = cu->getHeight(0) >> trDepth;<br>
- x265::primitives.blockcpy_ps(width, height, reconIPred, reconIPredStride, reconQt, reconQtStride);<br>
+ x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)reconIPred, reconIPredStride, reconQt, reconQtStride);<br>
<br>
if (!bLumaOnly && !bSkipChroma)<br>
{<br>
@@ -1597,11 +1597,11 @@<br>
reconIPredStride = cu->getPic()->getPicYuvRec()->getCStride();<br>
reconQt = m_qtTempTComYuv[qtlayer].getCbAddr(absPartIdx);<br>
reconQtStride = m_qtTempTComYuv[qtlayer].Cwidth;<br>
- x265::primitives.blockcpy_ps(width, height, reconIPred, reconIPredStride, reconQt, reconQtStride);<br>
+ x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)reconIPred, reconIPredStride, reconQt, reconQtStride);<br>
<br>
reconIPred = cu->getPic()->getPicYuvRec()->getCrAddr(cu->getAddr(), zOrder);<br>
reconQt = m_qtTempTComYuv[qtlayer].getCrAddr(absPartIdx);<br>
- x265::primitives.blockcpy_ps(width, height, reconIPred, reconIPredStride, reconQt, reconQtStride);<br>
+ x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)reconIPred, reconIPredStride, reconQt, reconQtStride);<br>
}<br>
}<br>
<br>
@@ -1728,13 +1728,13 @@<br>
{<br>
Pel* reconIPred = cu->getPic()->getPicYuvRec()->getCbAddr(cu->getAddr(), zorder);<br>
Short* reconQt = m_qtTempTComYuv[qtlayer].getCbAddr(absPartIdx);<br>
- x265::primitives.blockcpy_ps(width, height, reconIPred, reconIPredStride, reconQt, reconQtStride);<br>
+ x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)reconIPred, reconIPredStride, reconQt, reconQtStride);<br>
}<br>
if (stateU0V1Both2 == 1 || stateU0V1Both2 == 2)<br>
{<br>
Pel* reconIPred = cu->getPic()->getPicYuvRec()->getCrAddr(cu->getAddr(), zorder);<br>
Short* reconQt = m_qtTempTComYuv[qtlayer].getCrAddr(absPartIdx);<br>
- x265::primitives.blockcpy_ps(width, height, reconIPred, reconIPredStride, reconQt, reconQtStride);<br>
+ x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)reconIPred, reconIPredStride, reconQt, reconQtStride);<br>
}<br>
}<br>
}<br>
@@ -2254,7 +2254,7 @@<br>
UInt dststride = cu->getPic()->getPicYuvRec()->getStride();<br>
Pel* src = reconYuv->getLumaAddr(partOffset);<br>
UInt srcstride = reconYuv->getStride();<br>
- x265::primitives.blockcpy_pp(compWidth, compHeight, dst, dststride, src, srcstride);<br>
+ x265::primitives.blockcpy_pp((int)compWidth, compHeight, (pixel *)dst, dststride, (pixel *)src, srcstride);<br>
<br>
if (!bLumaOnly && !bSkipChroma)<br>
{<br>
@@ -2267,11 +2267,11 @@<br>
dststride = cu->getPic()->getPicYuvRec()->getCStride();<br>
src = reconYuv->getCbAddr(partOffset);<br>
srcstride = reconYuv->getCStride();<br>
- x265::primitives.blockcpy_pp(compWidth, compHeight, dst, dststride, src, srcstride);<br>
+ x265::primitives.blockcpy_pp((int)compWidth, compHeight, (pixel *)dst, dststride, (pixel *)src, srcstride);<br>
<br>
dst = cu->getPic()->getPicYuvRec()->getCrAddr(cu->getAddr(), zorder);<br>
src = reconYuv->getCrAddr(partOffset);<br>
- x265::primitives.blockcpy_pp(compWidth, compHeight, dst, dststride, src, srcstride);<br>
+ x265::primitives.blockcpy_pp((int)compWidth, compHeight,(pixel *) dst, dststride, (pixel *)src, srcstride);<br>
}<br>
}<br>
<br>
<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>
<br></blockquote></div><br><br clear="all"><div><br></div>-- <br>Steve Borho
</div></div>