[x265-commits] [x265] asm: 16bpp fixup

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/5db9eba4b2df
branches:  
changeset: 5408:5db9eba4b2df
user:      Steve Borho <steve at borho.org>
date:      Sun Dec 01 19:44:23 2013 -0600
description:
asm: 16bpp fixup
Subject: [x265] asm: nits

details:   http://hg.videolan.org/x265/rev/e83550d5f10d
branches:  
changeset: 5409:e83550d5f10d
user:      Steve Borho <steve at borho.org>
date:      Sun Dec 01 19:44:27 2013 -0600
description:
asm: nits

diffstat:

 source/common/x86/asm-primitives.cpp |  24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (42 lines):

diff -r 5bf05c39e566 -r e83550d5f10d source/common/x86/asm-primitives.cpp
--- a/source/common/x86/asm-primitives.cpp	Sun Dec 01 17:41:43 2013 -0600
+++ b/source/common/x86/asm-primitives.cpp	Sun Dec 01 19:44:27 2013 -0600
@@ -496,17 +496,17 @@ void Setup_Assembly_Primitives(EncoderPr
         p.satd[LUMA_16x32] = x265_pixel_satd_16x32_sse2;
         p.satd[LUMA_16x64] = x265_pixel_satd_16x64_sse2;
 
-        p.sa8d_inter[LUMA_8x8]  = x265_pixel_sa8d_8x8_sse2;
-        p.sa8d_inter[LUMA_16x16]  = x265_pixel_sa8d_16x16_sse2;
+        p.sa8d_inter[LUMA_8x8] = x265_pixel_sa8d_8x8_sse2;
+        p.sa8d_inter[LUMA_16x16] = x265_pixel_sa8d_16x16_sse2;
 
-        p.sse_ss[LUMA_4x4]   = x265_pixel_ssd_ss_4x4_mmx2;
-        p.sse_ss[LUMA_4x8]   = x265_pixel_ssd_ss_4x8_mmx2;
-        p.sse_ss[LUMA_4x16]   = x265_pixel_ssd_ss_4x16_mmx2;
-        p.sse_ss[LUMA_8x4]   = x265_pixel_ssd_ss_8x4_sse2;
-        p.sse_ss[LUMA_8x8]   = x265_pixel_ssd_ss_8x8_sse2;
-        p.sse_ss[LUMA_8x16]   = x265_pixel_ssd_ss_8x16_sse2;
-        p.sse_ss[LUMA_16x8]   = x265_pixel_ssd_ss_16x8_sse2;
-        p.sse_ss[LUMA_16x16]   = x265_pixel_ssd_ss_16x16_sse2;
+        p.sse_ss[LUMA_4x4] = x265_pixel_ssd_ss_4x4_mmx2;
+        p.sse_ss[LUMA_4x8] = x265_pixel_ssd_ss_4x8_mmx2;
+        p.sse_ss[LUMA_4x16] = x265_pixel_ssd_ss_4x16_mmx2;
+        p.sse_ss[LUMA_8x4] = x265_pixel_ssd_ss_8x4_sse2;
+        p.sse_ss[LUMA_8x8] = x265_pixel_ssd_ss_8x8_sse2;
+        p.sse_ss[LUMA_8x16] = x265_pixel_ssd_ss_8x16_sse2;
+        p.sse_ss[LUMA_16x8] = x265_pixel_ssd_ss_16x8_sse2;
+        p.sse_ss[LUMA_16x16] = x265_pixel_ssd_ss_16x16_sse2;
 
         p.ssim_4x4x2_core = x265_pixel_ssim_4x4x2_core_sse2;
         PIXEL_AVG_W4(sse2);
@@ -533,8 +533,8 @@ void Setup_Assembly_Primitives(EncoderPr
     /* at HIGH_BIT_DEPTH, pixel == short so we can reuse a number of primitives */
     for (int i = 0; i < NUM_LUMA_PARTITIONS; i++)
     {
-        p.sse_pp[i] = sse_ss[i];
-        p.sse_sp[i] = sse_ss[i];
+        p.sse_pp[i] = (pixelcmp_t)p.sse_ss[i];
+        p.sse_sp[i] = (pixelcmp_sp_t)p.sse_ss[i];
     }
 
 #else // if HIGH_BIT_DEPTH