[x265] [PATCH] Fix Build Errors for HIGH_BIT_DEPTH enable

[mahesh at multicorewareinc.com]

# HG changeset patch
# User maheshpittala
# Date 1373650511 25200
# Node ID 78a1edffd5af804aa991403bd9e869835d801f9b
# Parent  a1b29fa01efbb58449452e2e8f7b6dedfcafcfa2
Fix Build Errors for HIGH_BIT_DEPTH enable

diff -r a1b29fa01efb -r 78a1edffd5af source/Lib/TLibCommon/TComWeightPrediction.cpp
--- a/source/Lib/TLibCommon/TComWeightPrediction.cpp	Thu Jul 11 22:32:42 2013 -0500
+++ b/source/Lib/TLibCommon/TComWeightPrediction.cpp	Fri Jul 12 10:35:11 2013 -0700
@@ -423,7 +423,7 @@
     UInt  srcStride = srcYuv0->width;
     UInt  dstStride  = outDstYuv->getStride();
 
-   x265::primitives.weightpUni(pSrcY0, dstY, srcStride, dstStride, width, height, w0, round, shift, offset, g_bitDepthY);
+   x265::primitives.weightpUni((short *)pSrcY0, (pixel *)dstY, srcStride, dstStride, width, height, w0, round, shift, offset, g_bitDepthY);
 
     // Chroma U : --------------------------------------------
     w0      = wp0[1].w;
@@ -438,7 +438,7 @@
     width  >>= 1;
     height >>= 1;
 
-    x265::primitives.weightpUni(pSrcU0, dstU, srcStride, dstStride, width, height, w0, round, shift, offset, g_bitDepthC);
+    x265::primitives.weightpUni((short *)pSrcU0, (pixel *)dstU, srcStride, dstStride, width, height, w0, round, shift, offset, g_bitDepthC);
 
     // Chroma V : --------------------------------------------
     w0      = wp0[2].w;
@@ -446,7 +446,7 @@
     shift   = wp0[2].shift + shiftNum;
     round   = shift ? (1 << (shift - 1)) : 0;
 
-    x265::primitives.weightpUni(pSrcU0, dstV, srcStride, dstStride, width, height, w0, round, shift, offset, g_bitDepthC);
+    x265::primitives.weightpUni((short *)pSrcU0, (pixel *)dstV, srcStride, dstStride, width, height, w0, round, shift, offset, g_bitDepthC);
 
 }
 
diff -r a1b29fa01efb -r 78a1edffd5af source/Lib/TLibEncoder/TEncSearch.cpp
--- a/source/Lib/TLibEncoder/TEncSearch.cpp	Thu Jul 11 22:32:42 2013 -0500
+++ b/source/Lib/TLibEncoder/TEncSearch.cpp	Fri Jul 12 10:35:11 2013 -0700
@@ -1374,7 +1374,7 @@
         UInt  srcstride = m_qtTempTComYuv[qtLayer].width;
         Pel*  dst       = cu->getPic()->getPicYuvRec()->getLumaAddr(cu->getAddr(), zorder);
         UInt  dststride = cu->getPic()->getPicYuvRec()->getStride();
-        x265::primitives.blockcpy_ps(width, height, dst, dststride, src, srcstride);
+        x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)dst, dststride, src, srcstride);
 
         if (!bLumaOnly)
         {
@@ -1384,11 +1384,11 @@
             srcstride = m_qtTempTComYuv[qtLayer].Cwidth;
             dst       = cu->getPic()->getPicYuvRec()->getCbAddr(cu->getAddr(), zorder);
             dststride = cu->getPic()->getPicYuvRec()->getCStride();
-            x265::primitives.blockcpy_ps(width, height, dst, dststride, src, srcstride);
+            x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)dst, dststride, src, srcstride);
 
             src = m_qtTempTComYuv[qtLayer].getCrAddr(absPartIdx);
             dst = cu->getPic()->getPicYuvRec()->getCrAddr(cu->getAddr(), zorder);
-            x265::primitives.blockcpy_ps(width, height, dst, dststride, src, srcstride);
+            x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)dst, dststride, src, srcstride);
         }
     }
 
@@ -1587,7 +1587,7 @@
     UInt   reconQtStride    = m_qtTempTComYuv[qtlayer].width;
     UInt   width            = cu->getWidth(0) >> trDepth;
     UInt   height           = cu->getHeight(0) >> trDepth;
-    x265::primitives.blockcpy_ps(width, height, reconIPred, reconIPredStride, reconQt, reconQtStride);
+    x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)reconIPred, reconIPredStride, reconQt, reconQtStride);
 
     if (!bLumaOnly && !bSkipChroma)
     {
@@ -1597,11 +1597,11 @@
         reconIPredStride = cu->getPic()->getPicYuvRec()->getCStride();
         reconQt = m_qtTempTComYuv[qtlayer].getCbAddr(absPartIdx);
         reconQtStride = m_qtTempTComYuv[qtlayer].Cwidth;
-        x265::primitives.blockcpy_ps(width, height, reconIPred, reconIPredStride, reconQt, reconQtStride);
+        x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)reconIPred, reconIPredStride, reconQt, reconQtStride);
 
         reconIPred = cu->getPic()->getPicYuvRec()->getCrAddr(cu->getAddr(), zOrder);
         reconQt    = m_qtTempTComYuv[qtlayer].getCrAddr(absPartIdx);
-        x265::primitives.blockcpy_ps(width, height, reconIPred, reconIPredStride, reconQt, reconQtStride);
+        x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)reconIPred, reconIPredStride, reconQt, reconQtStride);
     }
 }
 
@@ -1728,13 +1728,13 @@
         {
             Pel* reconIPred = cu->getPic()->getPicYuvRec()->getCbAddr(cu->getAddr(), zorder);
             Short* reconQt  = m_qtTempTComYuv[qtlayer].getCbAddr(absPartIdx);
-            x265::primitives.blockcpy_ps(width, height, reconIPred, reconIPredStride, reconQt, reconQtStride);
+            x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)reconIPred, reconIPredStride, reconQt, reconQtStride);
         }
         if (stateU0V1Both2 == 1 || stateU0V1Both2 == 2)
         {
             Pel* reconIPred = cu->getPic()->getPicYuvRec()->getCrAddr(cu->getAddr(), zorder);
             Short* reconQt  = m_qtTempTComYuv[qtlayer].getCrAddr(absPartIdx);
-            x265::primitives.blockcpy_ps(width, height, reconIPred, reconIPredStride, reconQt, reconQtStride);
+            x265::primitives.blockcpy_ps((int)width, (int)height, (pixel *)reconIPred, reconIPredStride, reconQt, reconQtStride);
         }
     }
 }
@@ -2254,7 +2254,7 @@
             UInt dststride   = cu->getPic()->getPicYuvRec()->getStride();
             Pel* src         = reconYuv->getLumaAddr(partOffset);
             UInt srcstride   = reconYuv->getStride();
-            x265::primitives.blockcpy_pp(compWidth, compHeight, dst, dststride, src, srcstride);
+            x265::primitives.blockcpy_pp((int)compWidth, compHeight, (pixel *)dst, dststride, (pixel *)src, srcstride);
 
             if (!bLumaOnly && !bSkipChroma)
             {
@@ -2267,11 +2267,11 @@
                 dststride   = cu->getPic()->getPicYuvRec()->getCStride();
                 src         = reconYuv->getCbAddr(partOffset);
                 srcstride   = reconYuv->getCStride();
-                x265::primitives.blockcpy_pp(compWidth, compHeight, dst, dststride, src, srcstride);
+                x265::primitives.blockcpy_pp((int)compWidth, compHeight, (pixel *)dst, dststride, (pixel *)src, srcstride);
 
                 dst         = cu->getPic()->getPicYuvRec()->getCrAddr(cu->getAddr(), zorder);
                 src         = reconYuv->getCrAddr(partOffset);
-                x265::primitives.blockcpy_pp(compWidth, compHeight, dst, dststride, src, srcstride);
+                x265::primitives.blockcpy_pp((int)compWidth, compHeight,(pixel *) dst, dststride, (pixel *)src, srcstride);
             }
         }
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: NEW_17J.patch
Type: text/x-patch
Size: 6903 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20130712/b3df7a9c/attachment.bin>