[x265] [PATCH] added macro call for luma partition blockcopy_ps function

praveen at multicorewareinc.com praveen at multicorewareinc.com
Mon Nov 11 17:06:30 CET 2013


# HG changeset patch
# User Praveen Tiwari
# Date 1384185981 -19800
# Node ID 97cc1aac2f3095472da7db0d95614ab02ded9210
# Parent  972a9a01d0b440c919becc8ec17e7187522a2e68
added macro call for luma partition blockcopy_ps function

diff -r 972a9a01d0b4 -r 97cc1aac2f30 source/common/x86/asm-primitives.cpp
--- a/source/common/x86/asm-primitives.cpp	Mon Nov 11 21:22:38 2013 +0530
+++ b/source/common/x86/asm-primitives.cpp	Mon Nov 11 21:36:21 2013 +0530
@@ -190,7 +190,8 @@
     p.luma_hpp[LUMA_ ## W ## x ## H] = x265_interp_8tap_horiz_pp_ ## W ## x ## H ## cpu; \
     p.luma_hps[LUMA_ ## W ## x ## H] = x265_interp_8tap_horiz_ps_ ## W ## x ## H ## cpu; \
     p.luma_vpp[LUMA_ ## W ## x ## H] = x265_interp_8tap_vert_pp_ ## W ## x ## H ## cpu; \
-    p.luma_vps[LUMA_ ## W ## x ## H] = x265_interp_8tap_vert_ps_ ## W ## x ## H ## cpu;
+    p.luma_vps[LUMA_ ## W ## x ## H] = x265_interp_8tap_vert_ps_ ## W ## x ## H ## cpu; \
+    p.luma_copy_ps[LUMA_ ## W ## x ## H] = x265_blockcopy_ps_ ## W ## x ## H ## cpu;
 
 #define SETUP_LUMA_BLOCKCOPY_FUNC_DEF(W, H, cpu) \
     p.luma_copy_pp[LUMA_ ## W ## x ## H] = x265_blockcopy_pp_ ## W ## x ## H ## cpu;
@@ -450,19 +451,6 @@
         p.chroma_copy_sp[CHROMA_2x4] = x265_blockcopy_sp_2x4_sse4;
         p.chroma_copy_sp[CHROMA_2x8] = x265_blockcopy_sp_2x8_sse4;
         p.chroma_copy_sp[CHROMA_6x8] = x265_blockcopy_sp_6x8_sse4;
-
-        // This function pointer initialization is temporary will be removed
-        // later with macro definitions.  It is used to avoid linker errors
-        // until all partitions are coded and commit smaller patches, easier to
-        // review.
-
-        p.luma_copy_ps[LUMA_16x64] = x265_blockcopy_ps_16x64_sse4;
-        p.luma_copy_ps[LUMA_32x64] = x265_blockcopy_ps_32x64_sse4;
-        p.luma_copy_ps[LUMA_48x64] = x265_blockcopy_ps_48x64_sse4;
-        p.luma_copy_ps[LUMA_64x16] = x265_blockcopy_ps_64x16_sse4;
-        p.luma_copy_ps[LUMA_64x32] = x265_blockcopy_ps_64x32_sse4;
-        p.luma_copy_ps[LUMA_64x48] = x265_blockcopy_ps_64x48_sse4;
-        p.luma_copy_ps[LUMA_64x64] = x265_blockcopy_ps_64x64_sse4;
     }
     if (cpuMask & X265_CPU_AVX)
     {


More information about the x265-devel mailing list