diff options
| author | James Darnley <jdarnley@obe.tv> | 2017-02-09 22:06:17 +0100 |
|---|---|---|
| committer | James Darnley <jdarnley@obe.tv> | 2017-02-18 20:26:49 +0100 |
| commit | 9d815b7424b56ffcf6f4dea4fd09c53661e4133a (patch) | |
| tree | dde7bb1047255e0d5627e6d9c7cf1c06f4149fbe | |
| parent | 56803218db9a52929366a0e67d827a50089f4982 (diff) | |
| download | ffmpeg-9d815b7424b56ffcf6f4dea4fd09c53661e4133a.tar.gz | |
avcodec/x86: deduplicate PASS8ROWS macro
| -rw-r--r-- | libavcodec/x86/h264_deblock.asm | 5 | ||||
| -rw-r--r-- | libavcodec/x86/h264_deblock_10bit.asm | 5 | ||||
| -rw-r--r-- | libavcodec/x86/hevc_deblock.asm | 5 | ||||
| -rw-r--r-- | libavutil/x86/x86util.asm | 5 |
4 files changed, 5 insertions, 15 deletions
diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm index fe0ab20266..435c8be56f 100644 --- a/libavcodec/x86/h264_deblock.asm +++ b/libavcodec/x86/h264_deblock.asm @@ -37,11 +37,6 @@ cextern pb_0 cextern pb_1 cextern pb_3 -; expands to [base],...,[base+7*stride] -%define PASS8ROWS(base, base3, stride, stride3) \ - [base], [base+stride], [base+stride*2], [base3], \ - [base3+stride], [base3+stride*2], [base3+stride3], [base3+stride*4] - %define PASS8ROWS(base, base3, stride, stride3, offset) \ PASS8ROWS(base+offset, base3+offset, stride, stride3) diff --git a/libavcodec/x86/h264_deblock_10bit.asm b/libavcodec/x86/h264_deblock_10bit.asm index c2953640bb..1af3257a67 100644 --- a/libavcodec/x86/h264_deblock_10bit.asm +++ b/libavcodec/x86/h264_deblock_10bit.asm @@ -843,11 +843,6 @@ DEBLOCK_LUMA_INTRA mova [r0+2*r1], m2 %endmacro -; expands to [base],...,[base+7*stride] -%define PASS8ROWS(base, base3, stride, stride3) \ - [base], [base+stride], [base+stride*2], [base3], \ - [base3+stride], [base3+stride*2], [base3+stride3], [base3+stride*4] - ; in: 8 rows of 4 words in %4..%11 ; out: 4 rows of 8 words in m0..m3 %macro TRANSPOSE4x8W_LOAD 8 diff --git a/libavcodec/x86/hevc_deblock.asm b/libavcodec/x86/hevc_deblock.asm index 48a597530b..85ee4800bb 100644 --- a/libavcodec/x86/hevc_deblock.asm +++ b/libavcodec/x86/hevc_deblock.asm @@ -39,11 +39,6 @@ cextern pw_m1 SECTION .text INIT_XMM sse2 -; expands to [base],...,[base+7*stride] -%define PASS8ROWS(base, base3, stride, stride3) \ - [base], [base+stride], [base+stride*2], [base3], \ - [base3+stride], [base3+stride*2], [base3+stride3], [base3+stride*4] - ; in: 8 rows of 4 bytes in %4..%11 ; out: 4 rows of 8 words in m0..m3 %macro TRANSPOSE4x8B_LOAD 8 diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 44ed750ae5..c063436e0a 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -29,6 +29,11 @@ %include "libavutil/x86/x86inc.asm" +; expands to [base],...,[base+7*stride] +%define PASS8ROWS(base, base3, stride, stride3) \ + [base], [base + stride], [base + 2*stride], [base3], \ + [base3 + stride], [base3 + 2*stride], [base3 + stride3], [base3 + stride*4] + %macro SBUTTERFLY 4 %ifidn %1, dqqq vperm2i128 m%4, m%2, m%3, q0301 |