<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Nov 6, 2013 at 11:13 PM, Min Chen <span dir="ltr"><<a href="mailto:chenm003@163.com" target="_blank">chenm003@163.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 Min Chen <<a href="mailto:chenm003@163.com">chenm003@163.com</a>><br>
# Date 1383801227 -28800<br>
# Node ID 2cf0e87eaf6e3d7679d2f6c278a7bb353a6d7826<br>
# Parent 93cccbe49a93dd4c054ef06aca76974948793613<br>
rename: pixelsub_sp to pixelsub_ps, because it sub two Pixel and result is Short<br>
<br>
diff -r 93cccbe49a93 -r 2cf0e87eaf6e source/common/TShortYUV.cpp<br>
--- a/source/common/TShortYUV.cpp Wed Nov 06 19:49:38 2013 -0600<br>
+++ b/source/common/TShortYUV.cpp Thu Nov 07 13:13:47 2013 +0800<br>
@@ -95,7 +95,7 @@<br>
int src1Stride = srcYuv1->getStride();<br>
int dstStride = m_width;<br>
<br>
- primitives.pixelsub_sp(x, y, dst, dstStride, src0, src1, src0Stride, src1Stride);<br>
+ primitives.pixelsub_ps(x, y, dst, dstStride, src0, src1, src0Stride, src1Stride);<br>
}<br>
<br>
void TShortYUV::subtractChroma(TComYuv* srcYuv0, TComYuv* srcYuv1, unsigned int trUnitIdx, unsigned int partSize)<br>
@@ -113,8 +113,8 @@<br>
int src1Stride = srcYuv1->getCStride();<br>
int dstStride = m_cwidth;<br>
<br>
- primitives.pixelsub_sp(x, y, dstU, dstStride, srcU0, srcU1, src0Stride, src1Stride);<br>
- primitives.pixelsub_sp(x, y, dstV, dstStride, srcV0, srcV1, src0Stride, src1Stride);<br>
+ primitives.pixelsub_ps(x, y, dstU, dstStride, srcU0, srcU1, src0Stride, src1Stride);<br>
+ primitives.pixelsub_ps(x, y, dstV, dstStride, srcV0, srcV1, src0Stride, src1Stride);<br>
}<br>
<br>
void TShortYUV::addClip(TShortYUV* srcYuv0, TShortYUV* srcYuv1, unsigned int trUnitIdx, unsigned int partSize)<br>
diff -r 93cccbe49a93 -r 2cf0e87eaf6e source/common/pixel.cpp<br>
--- a/source/common/pixel.cpp Wed Nov 06 19:49:38 2013 -0600<br>
+++ b/source/common/pixel.cpp Thu Nov 07 13:13:47 2013 +0800<br>
@@ -554,7 +554,7 @@<br>
}<br>
}<br>
<br>
-void pixelsub_sp_c(int bx, int by, int16_t *a, intptr_t dstride, pixel *b0, pixel *b1, intptr_t sstride0, intptr_t sstride1)<br>
+void pixelsub_ps_c(int bx, int by, int16_t *a, intptr_t dstride, pixel *b0, pixel *b1, intptr_t sstride0, intptr_t sstride1)<br>
{<br>
for (int y = 0; y < by; y++)<br>
{<br>
@@ -963,7 +963,7 @@<br>
p.weightpUniPixel = weightUnidirPix;<br>
p.weightpUni = weightUnidir;<br>
<br>
- p.pixelsub_sp = pixelsub_sp_c;<br>
+ p.pixelsub_ps = pixelsub_ps_c;<br>
p.pixeladd_pp = pixeladd_pp_c;<br>
p.pixeladd_ss = pixeladd_ss_c;<br>
<br>
diff -r 93cccbe49a93 -r 2cf0e87eaf6e source/common/primitives.h<br>
--- a/source/common/primitives.h Wed Nov 06 19:49:38 2013 -0600<br>
+++ b/source/common/primitives.h Thu Nov 07 13:13:47 2013 +0800<br>
@@ -173,7 +173,7 @@<br>
typedef void (*blockcpy_sp_t)(int bx, int by, int16_t *dst, intptr_t dstride, pixel *src, intptr_t sstride); // dst is aligned<br>
typedef void (*blockcpy_ps_t)(int bx, int by, pixel *dst, intptr_t dstride, int16_t *src, intptr_t sstride); // dst is aligned<br>
typedef void (*blockcpy_sc_t)(int bx, int by, int16_t *dst, intptr_t dstride, uint8_t *src, intptr_t sstride); // dst is aligned<br>
-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);<br>
+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);<br></blockquote><div><br></div><div>the testbench needs to be updated following this change</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
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);<br>
typedef void (*pixeladd_pp_t)(int bx, int by, pixel *dst, intptr_t dstride, pixel *src0, pixel *src1, intptr_t sstride0, intptr_t sstride1);<br>
typedef void (*pixelavg_pp_t)(pixel *dst, intptr_t dstride, pixel *src0, intptr_t sstride0, pixel *src1, intptr_t sstride1, int weight);<br>
@@ -278,7 +278,7 @@<br>
<br>
weightpUni_t weightpUni;<br>
weightpUniPixel_t weightpUniPixel;<br>
- pixelsub_sp_t pixelsub_sp;<br>
+ pixelsub_ps_t pixelsub_ps;<br>
pixeladd_ss_t pixeladd_ss;<br>
pixeladd_pp_t pixeladd_pp;<br>
pixelavg_pp_t pixelavg_pp[NUM_LUMA_PARTITIONS];<br>
diff -r 93cccbe49a93 -r 2cf0e87eaf6e source/common/vec/blockcopy-sse3.cpp<br>
--- a/source/common/vec/blockcopy-sse3.cpp Wed Nov 06 19:49:38 2013 -0600<br>
+++ b/source/common/vec/blockcopy-sse3.cpp Thu Nov 07 13:13:47 2013 +0800<br>
@@ -245,7 +245,7 @@<br>
}<br>
}<br>
<br>
-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)<br>
+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)<br>
{<br>
size_t aligncheck = (size_t)dst | (size_t)src0 | bx | sstride0 | sstride1 | dstride;<br>
<br>
@@ -395,7 +395,7 @@<br>
p.blockcpy_ps = blockcopy_ps;<br>
p.blockcpy_sp = blockcopy_sp;<br>
p.blockcpy_sc = blockcopy_sp;<br>
- p.pixelsub_sp = pixelsub_sp;<br>
+ p.pixelsub_ps = pixelsub_ps;<br>
p.pixeladd_ss = pixeladd_ss;<br>
#endif // if HIGH_BIT_DEPTH<br>
}<br>
<br>
_______________________________________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Steve Borho
</div></div>