[x265] [PATCH] rename: pixelsub_sp to pixelsub_ps, because it sub two Pixel and result is Short

[Min Chen]

# HG changeset patch
# User Min Chen <chenm003 at 163.com>
# Date 1383801227 -28800
# Node ID 2cf0e87eaf6e3d7679d2f6c278a7bb353a6d7826
# Parent  93cccbe49a93dd4c054ef06aca76974948793613
rename: pixelsub_sp to pixelsub_ps, because it sub two Pixel and result is Short

diff -r 93cccbe49a93 -r 2cf0e87eaf6e source/common/TShortYUV.cpp
--- a/source/common/TShortYUV.cpp	Wed Nov 06 19:49:38 2013 -0600
+++ b/source/common/TShortYUV.cpp	Thu Nov 07 13:13:47 2013 +0800
@@ -95,7 +95,7 @@
     int src1Stride = srcYuv1->getStride();
     int dstStride  = m_width;
 
-    primitives.pixelsub_sp(x, y, dst, dstStride, src0, src1, src0Stride, src1Stride);
+    primitives.pixelsub_ps(x, y, dst, dstStride, src0, src1, src0Stride, src1Stride);
 }
 
 void TShortYUV::subtractChroma(TComYuv* srcYuv0, TComYuv* srcYuv1, unsigned int trUnitIdx, unsigned int partSize)
@@ -113,8 +113,8 @@
     int src1Stride = srcYuv1->getCStride();
     int dstStride  = m_cwidth;
 
-    primitives.pixelsub_sp(x, y, dstU, dstStride, srcU0, srcU1, src0Stride, src1Stride);
-    primitives.pixelsub_sp(x, y, dstV, dstStride, srcV0, srcV1, src0Stride, src1Stride);
+    primitives.pixelsub_ps(x, y, dstU, dstStride, srcU0, srcU1, src0Stride, src1Stride);
+    primitives.pixelsub_ps(x, y, dstV, dstStride, srcV0, srcV1, src0Stride, src1Stride);
 }
 
 void TShortYUV::addClip(TShortYUV* srcYuv0, TShortYUV* srcYuv1, unsigned int trUnitIdx, unsigned int partSize)
diff -r 93cccbe49a93 -r 2cf0e87eaf6e source/common/pixel.cpp
--- a/source/common/pixel.cpp	Wed Nov 06 19:49:38 2013 -0600
+++ b/source/common/pixel.cpp	Thu Nov 07 13:13:47 2013 +0800
@@ -554,7 +554,7 @@
     }
 }
 
-void pixelsub_sp_c(int bx, int by, int16_t *a, intptr_t dstride, pixel *b0, pixel *b1, intptr_t sstride0, intptr_t sstride1)
+void pixelsub_ps_c(int bx, int by, int16_t *a, intptr_t dstride, pixel *b0, pixel *b1, intptr_t sstride0, intptr_t sstride1)
 {
     for (int y = 0; y < by; y++)
     {
@@ -963,7 +963,7 @@
     p.weightpUniPixel = weightUnidirPix;
     p.weightpUni = weightUnidir;
 
-    p.pixelsub_sp = pixelsub_sp_c;
+    p.pixelsub_ps = pixelsub_ps_c;
     p.pixeladd_pp = pixeladd_pp_c;
     p.pixeladd_ss = pixeladd_ss_c;
 
diff -r 93cccbe49a93 -r 2cf0e87eaf6e source/common/primitives.h
--- a/source/common/primitives.h	Wed Nov 06 19:49:38 2013 -0600
+++ b/source/common/primitives.h	Thu Nov 07 13:13:47 2013 +0800
@@ -173,7 +173,7 @@
 typedef void (*blockcpy_sp_t)(int bx, int by, int16_t *dst, intptr_t dstride, pixel *src, intptr_t sstride); // dst is aligned
 typedef void (*blockcpy_ps_t)(int bx, int by, pixel *dst, intptr_t dstride, int16_t *src, intptr_t sstride); // dst is aligned
 typedef void (*blockcpy_sc_t)(int bx, int by, int16_t *dst, intptr_t dstride, uint8_t *src, intptr_t sstride); // dst is aligned
-typedef void (*pixelsub_sp_t)(int bx, int by, int16_t *dst, intptr_t dstride, pixel *src0, pixel *src1, intptr_t sstride0, intptr_t sstride1);
+typedef void (*pixelsub_ps_t)(int bx, int by, int16_t *dst, intptr_t dstride, pixel *src0, pixel *src1, intptr_t sstride0, intptr_t sstride1);
 typedef void (*pixeladd_ss_t)(int bx, int by, int16_t *dst, intptr_t dstride, int16_t *src0, int16_t *src1, intptr_t sstride0, intptr_t sstride1);
 typedef void (*pixeladd_pp_t)(int bx, int by, pixel *dst, intptr_t dstride, pixel *src0, pixel *src1, intptr_t sstride0, intptr_t sstride1);
 typedef void (*pixelavg_pp_t)(pixel *dst, intptr_t dstride, pixel *src0, intptr_t sstride0, pixel *src1, intptr_t sstride1, int weight);
@@ -278,7 +278,7 @@
 
     weightpUni_t    weightpUni;
     weightpUniPixel_t weightpUniPixel;
-    pixelsub_sp_t   pixelsub_sp;
+    pixelsub_ps_t   pixelsub_ps;
     pixeladd_ss_t   pixeladd_ss;
     pixeladd_pp_t   pixeladd_pp;
     pixelavg_pp_t   pixelavg_pp[NUM_LUMA_PARTITIONS];
diff -r 93cccbe49a93 -r 2cf0e87eaf6e source/common/vec/blockcopy-sse3.cpp
--- a/source/common/vec/blockcopy-sse3.cpp	Wed Nov 06 19:49:38 2013 -0600
+++ b/source/common/vec/blockcopy-sse3.cpp	Thu Nov 07 13:13:47 2013 +0800
@@ -245,7 +245,7 @@
     }
 }
 
-void pixelsub_sp(int bx, int by, int16_t *dst, intptr_t dstride, uint8_t *src0, uint8_t *src1, intptr_t sstride0, intptr_t sstride1)
+void pixelsub_ps(int bx, int by, int16_t *dst, intptr_t dstride, uint8_t *src0, uint8_t *src1, intptr_t sstride0, intptr_t sstride1)
 {
     size_t aligncheck = (size_t)dst | (size_t)src0 | bx | sstride0 | sstride1 | dstride;
 
@@ -395,7 +395,7 @@
     p.blockcpy_ps = blockcopy_ps;
     p.blockcpy_sp = blockcopy_sp;
     p.blockcpy_sc = blockcopy_sp;
-    p.pixelsub_sp = pixelsub_sp;
+    p.pixelsub_ps = pixelsub_ps;
     p.pixeladd_ss = pixeladd_ss;
 #endif // if HIGH_BIT_DEPTH
 }