[FFmpeg-cvslog] Merge commit 'd9dccc03890a976dba59d66ed3b5aceeaa33d14c'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Mar 23 11:54:53 2017 +0100| [9954d5b44eec41a2ebcbc61f67ce719184c0ec57] | committer: Clément Bœsch

Merge commit 'd9dccc03890a976dba59d66ed3b5aceeaa33d14c'

* commit 'd9dccc03890a976dba59d66ed3b5aceeaa33d14c':
  hevc: x86: Refactor IDCT macro declarations

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9954d5b44eec41a2ebcbc61f67ce719184c0ec57
---

 libavcodec/x86/hevc_idct.asm | 51 +++++++++++---------------------------------
 1 file changed, 12 insertions(+), 39 deletions(-)

diff --git a/libavcodec/x86/hevc_idct.asm b/libavcodec/x86/hevc_idct.asm
index 33b437c..26649d0 100644
--- a/libavcodec/x86/hevc_idct.asm
+++ b/libavcodec/x86/hevc_idct.asm
@@ -74,50 +74,23 @@ cglobal hevc_idct_%1x%1_dc_%2, 1, 2, 1, coeff, tmp
     RET
 %endmacro
 
-; 8-bit
+%macro INIT_IDCT_DC 1
 INIT_MMX mmxext
-IDCT_DC_NL  4,      8
-IDCT_DC     8,  2,  8
+IDCT_DC_NL  4,      %1
+IDCT_DC     8,  2,  %1
 
 INIT_XMM sse2
-IDCT_DC_NL  8,      8
-IDCT_DC    16,  4,  8
-IDCT_DC    32, 16,  8
+IDCT_DC_NL  8,      %1
+IDCT_DC    16,  4,  %1
+IDCT_DC    32, 16,  %1
 
 %if HAVE_AVX2_EXTERNAL
 INIT_YMM avx2
-IDCT_DC    16,  2,  8
-IDCT_DC    32,  8,  8
+IDCT_DC    16,  2,  %1
+IDCT_DC    32,  8,  %1
 %endif ;HAVE_AVX2_EXTERNAL
+%endmacro
 
-; 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
-
-; 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
+INIT_IDCT_DC  8
+INIT_IDCT_DC 10
+INIT_IDCT_DC 12


======================================================================

diff --cc libavcodec/x86/hevc_idct.asm
index 33b437c,71e4607..26649d0
--- a/libavcodec/x86/hevc_idct.asm
+++ b/libavcodec/x86/hevc_idct.asm
@@@ -86,38 -86,10 +86,11 @@@ IDCT_DC    32, 16,  %
  
  %if HAVE_AVX2_EXTERNAL
  INIT_YMM avx2
- IDCT_DC    16,  2,  8
- IDCT_DC    32,  8,  8
+ IDCT_DC    16,  2,  %1
+ IDCT_DC    32,  8,  %1
  %endif ;HAVE_AVX2_EXTERNAL
+ %endmacro
  
- ; 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
- 
- ; 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
+ INIT_IDCT_DC  8
+ INIT_IDCT_DC 10
++INIT_IDCT_DC 12