<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Nov 13, 2013 at 9:02 AM, <span dir="ltr"><<a href="mailto:murugan@multicorewareinc.com" target="_blank">murugan@multicorewareinc.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 Murugan Vairavel <<a href="mailto:murugan@multicorewareinc.com">murugan@multicorewareinc.com</a>><br>
# Date 1384354925 -19800<br>
# Wed Nov 13 20:32:05 2013 +0530<br>
# Node ID ae46503b8f94b89300c2fcd027fbc30bcc6136eb<br>
# Parent 29f7e68d450f0b71153f6bf5794ae4d1c118ac55<br>
unit test code for scale1D_128to64<br>
<br>
diff -r 29f7e68d450f -r ae46503b8f94 source/common/pixel.cpp<br>
--- a/source/common/pixel.cpp Wed Nov 13 20:30:26 2013 +0530<br>
+++ b/source/common/pixel.cpp Wed Nov 13 20:32:05 2013 +0530<br>
@@ -974,6 +974,9 @@<br>
p.pixeladd_ss = pixeladd_ss_c;<br>
<br>
p.scale1D_128to64 = scale1D_128to64;<br>
+<br>
+ p.scale_1D_128to64 = scale1D_128to64;<br></blockquote><div><br></div><div>why is a new function pointer necessary?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+<br>
p.scale2D_64to32 = scale2D_64to32;<br>
p.frame_init_lowres_core = frame_init_lowres_core;<br>
p.ssim_4x4x2_core = ssim_4x4x2_core;<br>
diff -r 29f7e68d450f -r ae46503b8f94 source/common/primitives.h<br>
--- a/source/common/primitives.h Wed Nov 13 20:30:26 2013 +0530<br>
+++ b/source/common/primitives.h Wed Nov 13 20:32:05 2013 +0530<br>
@@ -281,6 +281,9 @@<br>
<br>
scale_t scale1D_128to64;<br>
scale_t scale2D_64to32;<br>
+<br>
+ scale_t scale_1D_128to64;<br>
+<br>
downscale_t frame_init_lowres_core;<br>
ssim_end4_t ssim_end_4;<br>
var_t var[NUM_LUMA_PARTITIONS];<br>
diff -r 29f7e68d450f -r ae46503b8f94 source/common/x86/asm-primitives.cpp<br>
--- a/source/common/x86/asm-primitives.cpp Wed Nov 13 20:30:26 2013 +0530<br>
+++ b/source/common/x86/asm-primitives.cpp Wed Nov 13 20:32:05 2013 +0530<br>
@@ -411,6 +411,8 @@<br>
// until all partitions are coded and commit smaller patches, easier to<br>
// review.<br>
<br>
+ p.scale_1D_128to64 = x265_scale_1D_128to64_sse2;<br>
+<br>
p.chroma_copy_sp[CHROMA_4x2] = x265_blockcopy_sp_4x2_sse2;<br>
p.chroma_copy_sp[CHROMA_4x4] = x265_blockcopy_sp_4x4_sse2;<br>
p.chroma_copy_sp[CHROMA_4x8] = x265_blockcopy_sp_4x8_sse2;<br>
diff -r 29f7e68d450f -r ae46503b8f94 source/common/x86/pixel.h<br>
--- a/source/common/x86/pixel.h Wed Nov 13 20:30:26 2013 +0530<br>
+++ b/source/common/x86/pixel.h Wed Nov 13 20:32:05 2013 +0530<br>
@@ -117,6 +117,8 @@<br>
int x265_pixel_satd_16x32_sse2(pixel *, intptr_t, pixel *, intptr_t);<br>
int x265_pixel_satd_16x64_sse2(pixel *, intptr_t, pixel *, intptr_t);<br>
<br>
+void x265_scale_1D_128to64_sse2(pixel *, pixel *, intptr_t);<br>
+<br>
DECL_PIXELS(uint64_t, var, mmx2, (pixel * pix, intptr_t i_stride))<br>
DECL_PIXELS(uint64_t, var, sse2, (pixel * pix, intptr_t i_stride))<br>
DECL_PIXELS(uint64_t, var, avx, (pixel * pix, intptr_t i_stride))<br>
diff -r 29f7e68d450f -r ae46503b8f94 source/test/pixelharness.cpp<br>
--- a/source/test/pixelharness.cpp Wed Nov 13 20:30:26 2013 +0530<br>
+++ b/source/test/pixelharness.cpp Wed Nov 13 20:32:05 2013 +0530<br>
@@ -586,6 +586,29 @@<br>
return true;<br>
}<br>
<br>
+bool PixelHarness::check_scale_pixel_t(scale_t ref, scale_t opt)<br>
+{<br>
+ ALIGN_VAR_16(pixel, ref_dest[64 * 64]);<br>
+ ALIGN_VAR_16(pixel, opt_dest[64 * 64]);<br>
+<br>
+ memset(ref_dest, 0, sizeof(ref_dest));<br>
+ memset(opt_dest, 0, sizeof(opt_dest));<br>
+<br>
+ int j = 0;<br>
+ for (int i = 0; i < ITERS; i++)<br>
+ {<br>
+ opt(opt_dest, pbuf1 + j, STRIDE);<br>
+ ref(ref_dest, pbuf1 + j, STRIDE);<br>
+<br>
+ if (memcmp(ref_dest, opt_dest, 64 * 64 * sizeof(pixel)))<br>
+ return false;<br>
+<br>
+ j += INCR;<br>
+ }<br>
+<br>
+ return true;<br>
+}<br>
+<br>
bool PixelHarness::testPartition(int part, const EncoderPrimitives& ref, const EncoderPrimitives& opt)<br>
{<br>
if (opt.satd[part])<br>
@@ -880,6 +903,15 @@<br>
return false;<br>
}<br>
}<br>
+<br>
+ if (opt.scale_1D_128to64)<br>
+ {<br>
+ if (!check_scale_pixel_t(ref.scale_1D_128to64, opt.scale_1D_128to64))<br>
+ {<br>
+ printf("scale1D_128to64 failed!\n");<br>
+ return false;<br>
+ }<br>
+ }<br>
return true;<br>
}<br>
<br>
@@ -1093,4 +1125,10 @@<br>
printf("downscale");<br>
REPORT_SPEEDUP(opt.frame_init_lowres_core, ref.frame_init_lowres_core, pbuf2, pbuf1, pbuf2, pbuf3, pbuf4, 64, 64, 64, 64);<br>
}<br>
+<br>
+ if (opt.scale_1D_128to64)<br>
+ {<br>
+ printf("scale_1D_128to64");<br>
+ REPORT_SPEEDUP(opt.scale_1D_128to64, ref.scale_1D_128to64, pbuf2, pbuf1, 64);<br>
+ }<br>
}<br>
diff -r 29f7e68d450f -r ae46503b8f94 source/test/pixelharness.h<br>
--- a/source/test/pixelharness.h Wed Nov 13 20:30:26 2013 +0530<br>
+++ b/source/test/pixelharness.h Wed Nov 13 20:32:05 2013 +0530<br>
@@ -61,6 +61,8 @@<br>
bool check_blockfill_s(blockfill_s_t ref, blockfill_s_t opt);<br>
<br>
bool check_pixel_sub_ps(pixel_sub_ps_t ref, pixel_sub_ps_t opt);<br>
+<br>
+ bool check_scale_pixel_t(scale_t ref, scale_t opt);<br>
public:<br>
<br>
PixelHarness();<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>