[x265] [PATCH] code cleanup and variable renaming in ipfilter.cpp

[deepthidevaki at multicorewareinc.com]

# HG changeset patch
# User Deepthi Devaki
# Date 1372679307 -19800
# Node ID e253e50f7c62b1314cfa3b4d76ab25cb02ffa465
# Parent  30c0e5591120904f989953e9c74038253d607e45
code cleanup and variable renaming in ipfilter.cpp

diff -r 30c0e5591120 -r e253e50f7c62 source/common/ipfilter.cpp
--- a/source/common/ipfilter.cpp	Sun Jun 30 00:03:01 2013 -0500
+++ b/source/common/ipfilter.cpp	Mon Jul 01 17:18:27 2013 +0530
@@ -436,33 +436,33 @@
     filterVertical_short_pel<8>(bitDepth, src, srcStride, dstP, dstStride, block_width, block_height, TComInterpolationFilter::m_lumaFilter[3]);
 }
 
-void xExtendPicCompBorder(pixel* piTxt, int iStride, int iWidth, int iHeight, int iMarginX, int iMarginY)
+void extendPicCompBorder(pixel* piTxt, int stride, int width, int height, int marginX, int marginY)
 {
     int   x, y;
     pixel*  pi;
 
     pi = piTxt;
-    for (y = 0; y < iHeight; y++)
+    for (y = 0; y < height; y++)
     {
-        for (x = 0; x < iMarginX; x++)
+        for (x = 0; x < marginX; x++)
         {
-            pi[-iMarginX + x] = pi[0];
-            pi[iWidth + x] = pi[iWidth - 1];
+            pi[-marginX + x] = pi[0];
+            pi[width + x] = pi[width - 1];
         }
 
-        pi += iStride;
+        pi += stride;
     }
 
-    pi -= (iStride + iMarginX);
-    for (y = 0; y < iMarginY; y++)
+    pi -= (stride + marginX);
+    for (y = 0; y < marginY; y++)
     {
-        ::memcpy(pi + (y + 1) * iStride, pi, sizeof(pixel) * (iWidth + (iMarginX << 1)));
+        ::memcpy(pi + (y + 1) * stride, pi, sizeof(pixel) * (width + (marginX << 1)));
     }
 
-    pi -= ((iHeight - 1) * iStride);
-    for (y = 0; y < iMarginY; y++)
+    pi -= ((height - 1) * stride);
+    for (y = 0; y < marginY; y++)
     {
-        ::memcpy(pi - (y + 1) * iStride, pi, sizeof(pixel) * (iWidth + (iMarginX << 1)));
+        ::memcpy(pi - (y + 1) * stride, pi, sizeof(pixel) * (width + (marginX << 1)));
     }
 }
 
@@ -471,9 +471,9 @@
     filterVertical_short_pel<8>(bitDepth, src, srcStride, dstI, dstStride, block_width, block_height, TComInterpolationFilter::m_lumaFilter[2]);
     filterVertical_short_pel<8>(bitDepth, src, srcStride, dstE, dstStride, block_width, block_height, TComInterpolationFilter::m_lumaFilter[1]);
     filterVertical_short_pel<8>(bitDepth, src, srcStride, dstP, dstStride, block_width, block_height, TComInterpolationFilter::m_lumaFilter[3]);
-    xExtendPicCompBorder(dstE, dstStride, block_width, block_height, marginX, marginY);
-    xExtendPicCompBorder(dstI, dstStride, block_width, block_height, marginX, marginY);
-    xExtendPicCompBorder(dstP, dstStride, block_width, block_height, marginX, marginY);
+    extendPicCompBorder(dstE, dstStride, block_width, block_height, marginX, marginY);
+    extendPicCompBorder(dstI, dstStride, block_width, block_height, marginX, marginY);
+    extendPicCompBorder(dstP, dstStride, block_width, block_height, marginX, marginY);
 }
 
 void filterHorizontalMultiplaneExtend(int bitDepth, pixel *src, int srcStride, short *midF, short* midA, short* midB, short* midC, int midStride, pixel *pDstA, pixel *pDstB, pixel *pDstC, int pDstStride, int block_width, int block_height, int marginX, int marginY)
@@ -486,9 +486,9 @@
     filterConvertShortToPel(bitDepth, midB, midStride, pDstB, pDstStride, block_width, block_height);
     filterConvertShortToPel(bitDepth, midC, midStride, pDstC, pDstStride, block_width, block_height);
 
-    xExtendPicCompBorder(pDstA, pDstStride, block_width, block_height, marginX, marginY);
-    xExtendPicCompBorder(pDstB, pDstStride, block_width, block_height, marginX, marginY);
-    xExtendPicCompBorder(pDstC, pDstStride, block_width, block_height, marginX, marginY); 
+    extendPicCompBorder(pDstA, pDstStride, block_width, block_height, marginX, marginY);
+    extendPicCompBorder(pDstB, pDstStride, block_width, block_height, marginX, marginY);
+    extendPicCompBorder(pDstC, pDstStride, block_width, block_height, marginX, marginY); 
 }
 }
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: xhevc_deepthid.patch
Type: text/x-patch
Size: 3969 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20130701/ba84a15b/attachment.bin>