On Thu, 21 Nov 2013, Anton Khirnov wrote:
From: Michael Niedermayer <[email protected]>
This does not yet include any actual AVX code
Signed-off-by: Anton Khirnov <[email protected]>
---
libswscale/x86/rgb2rgb.c | 11 +++++++++++
libswscale/x86/rgb2rgb_template.c | 6 +++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c
index d4f2580..e1c09f7 100644
--- a/libswscale/x86/rgb2rgb.c
+++ b/libswscale/x86/rgb2rgb.c
@@ -89,6 +89,7 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) =
0x0000001f0000001fULL;
#define COMPILE_TEMPLATE_MMXEXT 0
#define COMPILE_TEMPLATE_AMD3DNOW 0
#define COMPILE_TEMPLATE_SSE2 0
+#define COMPILE_TEMPLATE_AVX 0
//MMX versions
#undef RENAME
@@ -109,10 +110,18 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) =
0x0000001f0000001fULL;
#define RENAME(a) a ## _SSE2
#include "rgb2rgb_template.c"
+//AVX versions
+#undef RENAME
+#undef COMPILE_TEMPLATE_AVX
+#define COMPILE_TEMPLATE_AVX 1
+#define RENAME(a) a ## _AVX
+#include "rgb2rgb_template.c"
+
//3DNOW versions
#undef RENAME
#undef COMPILE_TEMPLATE_MMXEXT
#undef COMPILE_TEMPLATE_SSE2
+#undef COMPILE_TEMPLATE_AVX
#undef COMPILE_TEMPLATE_AMD3DNOW
#define COMPILE_TEMPLATE_MMXEXT 0
#define COMPILE_TEMPLATE_SSE2 0
@@ -142,5 +151,7 @@ av_cold void rgb2rgb_init_x86(void)
rgb2rgb_init_MMXEXT();
if (INLINE_SSE2(cpu_flags))
rgb2rgb_init_SSE2();
+ if (INLINE_AVX(cpu_flags))
+ rgb2rgb_init_AVX();
#endif /* HAVE_INLINE_ASM */
}
diff --git a/libswscale/x86/rgb2rgb_template.c
b/libswscale/x86/rgb2rgb_template.c
index 5aeef8c..e523d53 100644
--- a/libswscale/x86/rgb2rgb_template.c
+++ b/libswscale/x86/rgb2rgb_template.c
@@ -1871,7 +1871,7 @@ static inline void RENAME(rgb24toyv12)(const uint8_t
*src, uint8_t *ydst, uint8_
}
#endif /* !COMPILE_TEMPLATE_SSE2 */
-#if !COMPILE_TEMPLATE_AMD3DNOW
+#if !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX
static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2,
uint8_t *dest,
int width, int height, int src1Stride,
int src2Stride, int dstStride)
@@ -2509,7 +2509,7 @@ static av_cold void RENAME(rgb2rgb_init)(void)
uyvytoyuv420 = RENAME(uyvytoyuv420);
#endif /* !COMPILE_TEMPLATE_SSE2 */
-#if !COMPILE_TEMPLATE_AMD3DNOW
+#if !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX
interleaveBytes = RENAME(interleaveBytes);
-#endif /* !COMPILE_TEMPLATE_AMD3DNOW */
+#endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX*/
}
--
1.7.10.4
Odd double spaces before && and missing before */, and the commit message
can be tidied up as Luca pointed out. Otherwise I guess this is ok.
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
