diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-10-06 15:24:04 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-10-06 15:24:04 +0200 |
| commit | e4128c08d786eb5513578e8c6063671ba03226ab (patch) | |
| tree | e4792d5140c75c792098c1ed6908bbad33ff912a | |
| parent | 5801f9ed245ca5ebb57b0b5183de7a24aaece133 (diff) | |
| download | ffmpeg-e4128c08d786eb5513578e8c6063671ba03226ab.tar.gz | |
Revert "hevc: x86: Refactor IDCT macro declarations"
This reverts commit d9dccc03890a976dba59d66ed3b5aceeaa33d14c. There were
outstanding objections to this commit.
| -rw-r--r-- | libavcodec/x86/hevc_idct.asm | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/libavcodec/x86/hevc_idct.asm b/libavcodec/x86/hevc_idct.asm index 71e4607dd7..d662aa90ba 100644 --- a/libavcodec/x86/hevc_idct.asm +++ b/libavcodec/x86/hevc_idct.asm @@ -74,22 +74,34 @@ cglobal hevc_idct_%1x%1_dc_%2, 1, 2, 1, coeff, tmp RET %endmacro -%macro INIT_IDCT_DC 1 +; 8-bit INIT_MMX mmxext -IDCT_DC_NL 4, %1 -IDCT_DC 8, 2, %1 +IDCT_DC_NL 4, 8 +IDCT_DC 8, 2, 8 INIT_XMM sse2 -IDCT_DC_NL 8, %1 -IDCT_DC 16, 4, %1 -IDCT_DC 32, 16, %1 +IDCT_DC_NL 8, 8 +IDCT_DC 16, 4, 8 +IDCT_DC 32, 16, 8 %if HAVE_AVX2_EXTERNAL INIT_YMM avx2 -IDCT_DC 16, 2, %1 -IDCT_DC 32, 8, %1 +IDCT_DC 16, 2, 8 +IDCT_DC 32, 8, 8 %endif ;HAVE_AVX2_EXTERNAL -%endmacro -INIT_IDCT_DC 8 -INIT_IDCT_DC 10 +; 10-bit +INIT_MMX mmxext +IDCT_DC_NL 4, 10 +IDCT_DC 8, 2, 10 + +INIT_XMM sse2 +IDCT_DC_NL 8, 10 +IDCT_DC 16, 4, 10 +IDCT_DC 32, 16, 10 + +%if HAVE_AVX2_EXTERNAL +INIT_YMM avx2 +IDCT_DC 16, 2, 10 +IDCT_DC 32, 8, 10 +%endif ;HAVE_AVX2_EXTERNAL |