Commit a763b988 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Move MMX-accelerated chromas to mmx/

(Feel free to cleanup)
parent 0eb68c7e
......@@ -1363,7 +1363,6 @@ AS_IF([test "${enable_mmx}" != "no"], [
AC_DEFINE(HAVE_MMX_INTRINSICS, 1,
[Define to 1 if MMX intrinsics are available.])
MMX_CFLAGS="-mmmx"
VLC_ADD_CFLAGS([i420_rgb_mmx i420_yuy2_mmx i422_yuy2_mmx],[-mmmx])
])
AC_CACHE_CHECK([if $CC groks MMX inline assembly],
......@@ -1375,9 +1374,6 @@ AS_IF([test "${enable_mmx}" != "no"], [
AC_DEFINE(CAN_COMPILE_MMX, 1,
[Define to 1 inline MMX assembly is available.])
have_mmx="yes"
VLC_ADD_PLUGIN([i420_rgb_mmx])
VLC_ADD_PLUGIN([i420_yuy2_mmx])
VLC_ADD_PLUGIN([i422_yuy2_mmx])
])
AC_CACHE_CHECK([if $CC groks MMX EXT inline assembly],
......
......@@ -5,6 +5,32 @@ libmemcpymmx_plugin_la_CFLAGS = $(AM_CFLAGS)
libmemcpymmx_plugin_la_LIBADD = $(AM_LIBADD)
libmemcpymmx_plugin_la_DEPENDENCIES =
libi420_rgb_mmx_plugin_la_SOURCES = \
../video_chroma/i420_rgb.c \
../video_chroma/i420_rgb.h \
../video_chroma/i420_rgb16.c \
i420_rgb_mmx.h
libi420_rgb_mmx_plugin_la_CFLAGS = $(AM_CFLAGS)
libi420_rgb_mmx_plugin_la_LIBADD = $(AM_LIBADD)
libi420_rgb_mmx_plugin_la_DEPENDENCIES =
libi420_yuy2_mmx_plugin_la_SOURCES = \
../video_chroma/i420_yuy2.c \
../video_chroma/i420_yuy2.h
libi420_yuy2_mmx_plugin_la_CFLAGS = $(AM_CFLAGS)
libi420_yuy2_mmx_plugin_la_LIBADD = $(AM_LIBADD)
libi420_yuy2_mmx_plugin_la_DEPENDENCIES =
libi422_yuy2_mmx_plugin_la_SOURCES = \
../video_chroma/i422_yuy2.c \
../video_chroma/i422_yuy2.h
libi422_yuy2_mmx_plugin_la_CFLAGS = $(AM_CFLAGS)
libi422_yuy2_mmx_plugin_la_LIBADD = $(AM_LIBADD)
libi422_yuy2_mmx_plugin_la_DEPENDENCIES =
libvlc_LTLIBRARIES += \
libmemcpymmx_plugin.la \
libi420_rgb_mmx_plugin.la \
libi420_yuy2_mmx_plugin.la \
libi422_yuy2_mmx_plugin.la \
$(NULL)
......@@ -6,13 +6,6 @@ SOURCES_i420_rgb = \
i420_rgb_c.h \
$(NULL)
SOURCES_i420_rgb_mmx = \
i420_rgb.c \
i420_rgb.h \
i420_rgb16.c \
i420_rgb_mmx.h \
$(NULL)
SOURCES_i420_rgb_sse2 = \
i420_rgb.c \
i420_rgb.h \
......@@ -25,11 +18,6 @@ SOURCES_i420_yuy2 = \
i420_yuy2.h \
$(NULL)
SOURCES_i420_yuy2_mmx = \
i420_yuy2.c \
i420_yuy2.h \
$(NULL)
SOURCES_i420_yuy2_sse2 = \
i420_yuy2.c \
i420_yuy2.h \
......@@ -45,11 +33,6 @@ SOURCES_i422_yuy2 = \
i422_yuy2.h \
$(NULL)
SOURCES_i422_yuy2_mmx = \
i422_yuy2.c \
i422_yuy2.h \
$(NULL)
SOURCES_i422_yuy2_sse2 = \
i422_yuy2.c \
i422_yuy2.h \
......
......@@ -88,7 +88,6 @@ vlc_module_begin ()
set_description( N_( "MMX I420,IYUV,YV12 to "
"RV15,RV16,RV24,RV32 conversions") )
set_capability( "video filter2", 100 )
add_requirement( MMX )
#elif defined (MODULE_NAME_IS_i420_rgb_sse2)
set_description( N_( "SSE2 I420,IYUV,YV12 to "
"RV15,RV16,RV24,RV32 conversions") )
......
......@@ -37,9 +37,9 @@
#if defined (MODULE_NAME_IS_i420_rgb)
# include "i420_rgb_c.h"
#elif defined (MODULE_NAME_IS_i420_rgb_mmx)
# include "i420_rgb_mmx.h"
# include "../mmx/i420_rgb_mmx.h"
#elif defined (MODULE_NAME_IS_i420_rgb_sse2)
# include "i420_rgb_mmx.h"
# include "../mmx/i420_rgb_mmx.h"
#endif
static void SetOffset( int, int, int, int, bool *,
......
......@@ -91,7 +91,6 @@ vlc_module_begin ()
#elif defined (MODULE_NAME_IS_i420_yuy2_mmx)
set_description( N_("MMX conversions from " SRC_FOURCC " to " DEST_FOURCC) )
set_capability( "video filter2", 160 )
add_requirement( MMX )
#elif defined (MODULE_NAME_IS_i420_yuy2_sse2)
set_description( N_("SSE2 conversions from " SRC_FOURCC " to " DEST_FOURCC) )
set_capability( "video filter2", 250 )
......
......@@ -74,7 +74,6 @@ vlc_module_begin ()
#elif defined (MODULE_NAME_IS_i422_yuy2_mmx)
set_description( N_("MMX conversions from " SRC_FOURCC " to " DEST_FOURCC) )
set_capability( "video filter2", 100 )
add_requirement( MMX )
#elif defined (MODULE_NAME_IS_i422_yuy2_sse2)
set_description( N_("SSE2 conversions from " SRC_FOURCC " to " DEST_FOURCC) )
set_capability( "video filter2", 120 )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment