[x265] [PATCH] WeightedPredicton: Code cleanup, variable renaming - no logic change

deepthidevaki at multicorewareinc.com deepthidevaki at multicorewareinc.com
Thu Jul 11 13:32:47 CEST 2013


# HG changeset patch
# User Deepthi Devaki
# Date 1373542350 -19800
# Node ID 7e6efa268c92900a258094a5316e669df4ea1884
# Parent  91c591f8a12e423f095acaf0ebdfb1d04167b149
WeightedPredicton: Code cleanup, variable renaming - no logic change.

diff -r 91c591f8a12e -r 7e6efa268c92 source/common/pixel.cpp
--- a/source/common/pixel.cpp	Thu Jul 11 14:56:18 2013 +0530
+++ b/source/common/pixel.cpp	Thu Jul 11 17:02:30 2013 +0530
@@ -501,7 +501,7 @@
     }
 }
 
-void weightUnidir(short *pSrcY0, pixel *pDstY, int srcStride, int dstStride, int width, int height, int w0, int round, int shift, int offset, int bitDepth)
+void weightUnidir(short *src, pixel *dst, int srcStride, int dstStride, int width, int height, int w0, int round, int shift, int offset, int bitDepth)
 {
     int x, y;
     for (y = height - 1; y >= 0; y--)
@@ -509,14 +509,14 @@
         for (x = width - 1; x >= 0; )
         {
             // note: luma min width is 4
-            pDstY[x] = (pixel) Clip3(0, ((1 << bitDepth) - 1), ((w0 * (pSrcY0[x] + IF_INTERNAL_OFFS) + round) >> shift) + offset);
+            dst[x] = (pixel) Clip3(0, ((1 << bitDepth) - 1), ((w0 * (src[x] + IF_INTERNAL_OFFS) + round) >> shift) + offset);
             x--;
-            pDstY[x] = (pixel) Clip3(0, ((1 << bitDepth) - 1), ((w0 * (pSrcY0[x] + IF_INTERNAL_OFFS) + round) >> shift) + offset);
+            dst[x] = (pixel) Clip3(0, ((1 << bitDepth) - 1), ((w0 * (src[x] + IF_INTERNAL_OFFS) + round) >> shift) + offset);
             x--;
         }
 
-        pSrcY0 += srcStride;
-        pDstY  += dstStride;
+        src += srcStride;
+        dst  += dstStride;
     }
 }
 
diff -r 91c591f8a12e -r 7e6efa268c92 source/common/primitives.h
--- a/source/common/primitives.h	Thu Jul 11 14:56:18 2013 +0530
+++ b/source/common/primitives.h	Thu Jul 11 17:02:30 2013 +0530
@@ -215,7 +215,7 @@
 typedef void (*dequant_t)(int bitDepth, const int* src, int* dst, int width, int height, int mcqp_miper, int mcqp_mirem, bool useScalingList, unsigned int trSizeLog2, int *dequantCoef);
 typedef uint32_t (*quantaq_t)(int *coef, int *quantCoeff, int *deltaU, int *qCoef, int *arlCCoef, int qBitsC, int qBits, int add, int numCoeff);
 typedef uint32_t (*quant_t)(int *coef, int *quantCoeff, int *deltaU, int *qCoef, int qBits, int add, int numCoeff);
-typedef void (*weightpUni_t)(short *pSrcY0, pixel *pDstY, int srcStride, int dstStride, int width, int height, int w0, int round, int shift, int offset, int bitDepth);
+typedef void (*weightpUni_t)(short *src, pixel *dst, int srcStride, int dstStride, int width, int height, int w0, int round, int shift, int offset, int bitDepth);
 
 /* Define a structure containing function pointers to optimized encoder
  * primitives.  Each pointer can reference either an assembly routine,


More information about the x265-devel mailing list