You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-15 14:13:16 +02:00
Merge commit 'e4128c08d786eb5513578e8c6063671ba03226ab'
* commit 'e4128c08d786eb5513578e8c6063671ba03226ab': Revert "hevc: x86: Refactor IDCT macro declarations" So apparently this was technically correct be reverted due to authorship. Reverted as well in FFmpeg for now... See http://lists.libav.org/pipermail/libav-devel/2016-October/079560.html Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
@@ -74,23 +74,50 @@ cglobal hevc_idct_%1x%1_dc_%2, 1, 2, 1, coeff, tmp
|
|||||||
RET
|
RET
|
||||||
%endmacro
|
%endmacro
|
||||||
|
|
||||||
%macro INIT_IDCT_DC 1
|
; 8-bit
|
||||||
INIT_MMX mmxext
|
INIT_MMX mmxext
|
||||||
IDCT_DC_NL 4, %1
|
IDCT_DC_NL 4, 8
|
||||||
IDCT_DC 8, 2, %1
|
IDCT_DC 8, 2, 8
|
||||||
|
|
||||||
INIT_XMM sse2
|
INIT_XMM sse2
|
||||||
IDCT_DC_NL 8, %1
|
IDCT_DC_NL 8, 8
|
||||||
IDCT_DC 16, 4, %1
|
IDCT_DC 16, 4, 8
|
||||||
IDCT_DC 32, 16, %1
|
IDCT_DC 32, 16, 8
|
||||||
|
|
||||||
%if HAVE_AVX2_EXTERNAL
|
%if HAVE_AVX2_EXTERNAL
|
||||||
INIT_YMM avx2
|
INIT_YMM avx2
|
||||||
IDCT_DC 16, 2, %1
|
IDCT_DC 16, 2, 8
|
||||||
IDCT_DC 32, 8, %1
|
IDCT_DC 32, 8, 8
|
||||||
%endif ;HAVE_AVX2_EXTERNAL
|
%endif ;HAVE_AVX2_EXTERNAL
|
||||||
%endmacro
|
|
||||||
|
|
||||||
INIT_IDCT_DC 8
|
; 10-bit
|
||||||
INIT_IDCT_DC 10
|
INIT_MMX mmxext
|
||||||
INIT_IDCT_DC 12
|
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
|
||||||
|
|
||||||
|
; 12-bit
|
||||||
|
INIT_MMX mmxext
|
||||||
|
IDCT_DC_NL 4, 12
|
||||||
|
IDCT_DC 8, 2, 12
|
||||||
|
|
||||||
|
INIT_XMM sse2
|
||||||
|
IDCT_DC_NL 8, 12
|
||||||
|
IDCT_DC 16, 4, 12
|
||||||
|
IDCT_DC 32, 16, 12
|
||||||
|
|
||||||
|
%if HAVE_AVX2_EXTERNAL
|
||||||
|
INIT_YMM avx2
|
||||||
|
IDCT_DC 16, 2, 12
|
||||||
|
IDCT_DC 32, 8, 12
|
||||||
|
%endif ;HAVE_AVX2_EXTERNAL
|
||||||
|
Reference in New Issue
Block a user