Permalink
Browse files

Fix CLPF simd bug and enable CLPF simd.

  • Loading branch information...
1 parent aed7f56 commit 0dde220e3df71fdd949fe17be75f8b50822d94a9 Arild Fuldseth (arilfuld) committed with Thomas Davies Jan 20, 2017
Showing with 7 additions and 6 deletions.
  1. +3 −2 common/common_frame.c
  2. +2 −2 common/common_kernels.c
  3. +2 −2 common/common_kernels_gen.c
@@ -872,8 +872,9 @@ void TEMPLATE(clpf_frame)(const yuv_frame_t *frame, const yuv_frame_t *org, cons
if (++cache_idx >= cache_blocks) cache_idx = 0;
// Apply the filter
- TEMPLATE(clpf_block)(src_buffer, dst_buffer, sstride, dstride, xpos,
- ypos, sizex, sizey, width, height, strength);
+ (use_simd ? TEMPLATE(clpf_block_simd) : TEMPLATE(clpf_block))
+ (src_buffer, dst_buffer, sstride, dstride, xpos,
+ ypos, sizex, sizey, width, height, strength);
}
}
}
@@ -1680,8 +1680,8 @@ void TEMPLATE(clpf_block8)(const SAMPLE *src, SAMPLE *dst, int sstride, int dstr
#else
static ALIGN(16) uint64_t bshuff[] = { 0x0504030201000000LL, 0x0d0c0b0a09080808LL };
static ALIGN(16) uint64_t cshuff[] = { 0x0605040302010000LL, 0x0e0d0c0b0a090808LL };
- static ALIGN(16) uint64_t dshuff[] = { 0x0707060503030201LL, 0x0f0f0e0d0b0b0a09LL };
- static ALIGN(16) uint64_t eshuff[] = { 0x0707070603030302LL, 0x0f0f0f0e0b0b0b0aLL };
+ static ALIGN(16) uint64_t dshuff[] = { 0x0707060504030201LL, 0x0f0f0e0d0c0b0a09LL };
+ static ALIGN(16) uint64_t eshuff[] = { 0x0707070605040302LL, 0x0f0f0f0e0d0c0b0aLL };
#endif
dst += x0 + y0*dstride;
@@ -1680,8 +1680,8 @@ void TEMPLATE(clpf_block8)(const SAMPLE *src, SAMPLE *dst, int sstride, int dstr
#else
static ALIGN(16) uint64_t bshuff[] = { 0x0504030201000000LL, 0x0d0c0b0a09080808LL };
static ALIGN(16) uint64_t cshuff[] = { 0x0605040302010000LL, 0x0e0d0c0b0a090808LL };
- static ALIGN(16) uint64_t dshuff[] = { 0x0707060503030201LL, 0x0f0f0e0d0b0b0a09LL };
- static ALIGN(16) uint64_t eshuff[] = { 0x0707070603030302LL, 0x0f0f0f0e0b0b0b0aLL };
+ static ALIGN(16) uint64_t dshuff[] = { 0x0707060504030201LL, 0x0f0f0e0d0c0b0a09LL };
+ static ALIGN(16) uint64_t eshuff[] = { 0x0707070605040302LL, 0x0f0f0f0e0d0c0b0aLL };
#endif
dst += x0 + y0*dstride;

0 comments on commit 0dde220

Please sign in to comment.