@@ -68,7 +68,7 @@ cglobal ac3_exponent_min_%1, 3,4,2, exp, reuse_blks, expn, offset | |||||
%define LOOP_ALIGN | %define LOOP_ALIGN | ||||
INIT_MMX | INIT_MMX | ||||
AC3_EXPONENT_MIN mmx | AC3_EXPONENT_MIN mmx | ||||
%if HAVE_MMXEXT | |||||
%if HAVE_MMXEXT_EXTERNAL | |||||
%define PMINUB PMINUB_MMXEXT | %define PMINUB PMINUB_MMXEXT | ||||
%define LOOP_ALIGN ALIGN 16 | %define LOOP_ALIGN ALIGN 16 | ||||
AC3_EXPONENT_MIN mmxext | AC3_EXPONENT_MIN mmxext | ||||
@@ -390,7 +390,7 @@ cglobal deblock_h_luma_8, 5,9 | |||||
INIT_XMM sse2 | INIT_XMM sse2 | ||||
DEBLOCK_LUMA | DEBLOCK_LUMA | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
DEBLOCK_LUMA | DEBLOCK_LUMA | ||||
%endif | %endif | ||||
@@ -511,7 +511,7 @@ INIT_MMX mmx2 | |||||
DEBLOCK_LUMA v8, 8 | DEBLOCK_LUMA v8, 8 | ||||
INIT_XMM sse2 | INIT_XMM sse2 | ||||
DEBLOCK_LUMA v, 16 | DEBLOCK_LUMA v, 16 | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
DEBLOCK_LUMA v, 16 | DEBLOCK_LUMA v, 16 | ||||
%endif | %endif | ||||
@@ -785,7 +785,7 @@ cglobal deblock_h_luma_intra_8, 2,4 | |||||
INIT_XMM sse2 | INIT_XMM sse2 | ||||
DEBLOCK_LUMA_INTRA v | DEBLOCK_LUMA_INTRA v | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
DEBLOCK_LUMA_INTRA v | DEBLOCK_LUMA_INTRA v | ||||
%endif | %endif | ||||
@@ -418,7 +418,7 @@ cglobal deblock_h_luma_10, 5,7,15 | |||||
INIT_XMM sse2 | INIT_XMM sse2 | ||||
DEBLOCK_LUMA_64 | DEBLOCK_LUMA_64 | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
DEBLOCK_LUMA_64 | DEBLOCK_LUMA_64 | ||||
%endif | %endif | ||||
@@ -715,7 +715,7 @@ cglobal deblock_h_luma_intra_10, 4,7,16 | |||||
INIT_XMM sse2 | INIT_XMM sse2 | ||||
DEBLOCK_LUMA_INTRA_64 | DEBLOCK_LUMA_INTRA_64 | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
DEBLOCK_LUMA_INTRA_64 | DEBLOCK_LUMA_INTRA_64 | ||||
%endif | %endif | ||||
@@ -802,7 +802,7 @@ DEBLOCK_LUMA_INTRA | |||||
INIT_XMM sse2 | INIT_XMM sse2 | ||||
DEBLOCK_LUMA | DEBLOCK_LUMA | ||||
DEBLOCK_LUMA_INTRA | DEBLOCK_LUMA_INTRA | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
DEBLOCK_LUMA | DEBLOCK_LUMA | ||||
DEBLOCK_LUMA_INTRA | DEBLOCK_LUMA_INTRA | ||||
@@ -918,7 +918,7 @@ DEBLOCK_CHROMA | |||||
%endif | %endif | ||||
INIT_XMM sse2 | INIT_XMM sse2 | ||||
DEBLOCK_CHROMA | DEBLOCK_CHROMA | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
DEBLOCK_CHROMA | DEBLOCK_CHROMA | ||||
%endif | %endif |
@@ -371,7 +371,7 @@ DEFINE_IMDCT | |||||
INIT_XMM ssse3 | INIT_XMM ssse3 | ||||
DEFINE_IMDCT | DEFINE_IMDCT | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
DEFINE_IMDCT | DEFINE_IMDCT | ||||
%endif | %endif | ||||
@@ -719,7 +719,7 @@ cglobal four_imdct36_float, 5,5,16, out, buf, in, win, tmp | |||||
INIT_XMM sse | INIT_XMM sse | ||||
DEFINE_FOUR_IMDCT | DEFINE_FOUR_IMDCT | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
DEFINE_FOUR_IMDCT | DEFINE_FOUR_IMDCT | ||||
%endif | %endif |
@@ -319,7 +319,7 @@ INIT_XMM sse2 | |||||
idct_put_fn 16 | idct_put_fn 16 | ||||
INIT_XMM sse4 | INIT_XMM sse4 | ||||
idct_put_fn 16 | idct_put_fn 16 | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
idct_put_fn 16 | idct_put_fn 16 | ||||
%endif | %endif | ||||
@@ -76,14 +76,14 @@ cglobal v210_planar_unpack_%1_%2, 5, 5 | |||||
INIT_XMM | INIT_XMM | ||||
v210_planar_unpack unaligned, ssse3 | v210_planar_unpack unaligned, ssse3 | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_AVX | INIT_AVX | ||||
v210_planar_unpack unaligned, avx | v210_planar_unpack unaligned, avx | ||||
%endif | %endif | ||||
INIT_XMM | INIT_XMM | ||||
v210_planar_unpack aligned, ssse3 | v210_planar_unpack aligned, ssse3 | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_AVX | INIT_AVX | ||||
v210_planar_unpack aligned, avx | v210_planar_unpack aligned, avx | ||||
%endif | %endif |
@@ -446,7 +446,7 @@ PACK_6CH float, int32, a, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |||||
PACK_6CH int32, float, u, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | PACK_6CH int32, float, u, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | ||||
PACK_6CH int32, float, a, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | PACK_6CH int32, float, a, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
PACK_6CH float, float, u, 2, 2, NOP_N, NOP_N | PACK_6CH float, float, u, 2, 2, NOP_N, NOP_N | ||||
PACK_6CH float, float, a, 2, 2, NOP_N, NOP_N | PACK_6CH float, float, a, 2, 2, NOP_N, NOP_N | ||||
@@ -243,7 +243,7 @@ MIX1_INT16 a | |||||
MIX2_INT16 u | MIX2_INT16 u | ||||
MIX2_INT16 a | MIX2_INT16 a | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_YMM avx | INIT_YMM avx | ||||
MIX2_FLT u | MIX2_FLT u | ||||
MIX2_FLT a | MIX2_FLT a | ||||
@@ -304,7 +304,7 @@ RGB24_FUNCS 10, 12 | |||||
INIT_XMM ssse3 | INIT_XMM ssse3 | ||||
RGB24_FUNCS 11, 13 | RGB24_FUNCS 11, 13 | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
RGB24_FUNCS 11, 13 | RGB24_FUNCS 11, 13 | ||||
%endif | %endif | ||||
@@ -450,7 +450,7 @@ RGB32_FUNCS 0, 0 | |||||
INIT_XMM sse2 | INIT_XMM sse2 | ||||
RGB32_FUNCS 8, 12 | RGB32_FUNCS 8, 12 | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
RGB32_FUNCS 8, 12 | RGB32_FUNCS 8, 12 | ||||
%endif | %endif | ||||
@@ -660,7 +660,7 @@ YUYV_TO_UV_FN 3, uyvy | |||||
NVXX_TO_UV_FN 5, nv12 | NVXX_TO_UV_FN 5, nv12 | ||||
NVXX_TO_UV_FN 5, nv21 | NVXX_TO_UV_FN 5, nv21 | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
; in theory, we could write a yuy2-to-y using vpand (i.e. AVX), but | ; in theory, we could write a yuy2-to-y using vpand (i.e. AVX), but | ||||
; that's not faster in practice | ; that's not faster in practice | ||||
@@ -267,7 +267,7 @@ yuv2planeX_fn 9, 7, 5 | |||||
yuv2planeX_fn 10, 7, 5 | yuv2planeX_fn 10, 7, 5 | ||||
yuv2planeX_fn 16, 8, 5 | yuv2planeX_fn 16, 8, 5 | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
yuv2planeX_fn 8, 10, 7 | yuv2planeX_fn 8, 10, 7 | ||||
yuv2planeX_fn 9, 7, 5 | yuv2planeX_fn 9, 7, 5 | ||||
@@ -407,7 +407,7 @@ yuv2plane1_fn 16, 6, 3 | |||||
INIT_XMM sse4 | INIT_XMM sse4 | ||||
yuv2plane1_fn 16, 5, 3 | yuv2plane1_fn 16, 5, 3 | ||||
%if HAVE_AVX | |||||
%if HAVE_AVX_EXTERNAL | |||||
INIT_XMM avx | INIT_XMM avx | ||||
yuv2plane1_fn 8, 5, 5 | yuv2plane1_fn 8, 5, 5 | ||||
yuv2plane1_fn 9, 5, 3 | yuv2plane1_fn 9, 5, 3 | ||||