Move MMX-accelerated chromas to mmx/

(Feel free to cleanup)

diff --git a/configure.ac b/configure.ac
index e596ab5ed23488951468e690c9c0d5441a8bf60f..9e09a8f644d64debc466e13428386c6d9cfba64c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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],

diff --git a/modules/mmx/Modules.am b/modules/mmx/Modules.am
index 50fd6ee28782be9cc489612cbce6cc6347e19654..b2d4b11d9891b552b68d5f967f2e6efae0c56428 100644 (file)
--- a/modules/mmx/Modules.am
+++ b/modules/mmx/Modules.am
@@ -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)

diff --git a/modules/video_chroma/i420_rgb_mmx.h b/modules/mmx/i420_rgb_mmx.h
similarity index 100%
rename from modules/video_chroma/i420_rgb_mmx.h
rename to modules/mmx/i420_rgb_mmx.h

diff --git a/modules/video_chroma/Modules.am b/modules/video_chroma/Modules.am
index 08598322e38dbbc2ed61f6a15bbd1a383807a204..60be5211f454e93240a8172c1fb3b26188a877e2 100644 (file)
--- a/modules/video_chroma/Modules.am
+++ b/modules/video_chroma/Modules.am
@@ -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 \

diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c
index d07272039110d266268ee7121e1910635a2a1ae0..0d5bf647edbf64e3b537f34261604ec49d384b81 100644 (file)
--- a/modules/video_chroma/i420_rgb.c
+++ b/modules/video_chroma/i420_rgb.c
@@ -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") )

diff --git a/modules/video_chroma/i420_rgb16.c b/modules/video_chroma/i420_rgb16.c
index a8532f72e2e83160eff638b46c6da4bdc39a87b0..de9428f320af399ce09c9ae6c0bb50b7d69ac594 100644 (file)
--- a/modules/video_chroma/i420_rgb16.c
+++ b/modules/video_chroma/i420_rgb16.c
@@ -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 *,

diff --git a/modules/video_chroma/i420_yuy2.c b/modules/video_chroma/i420_yuy2.c
index b4672933a0c2d2afb05335a788e9714690bfb88d..f05b746f68d4cdcbb07db19a59f9a45c50d97949 100644 (file)
--- a/modules/video_chroma/i420_yuy2.c
+++ b/modules/video_chroma/i420_yuy2.c
@@ -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 )

diff --git a/modules/video_chroma/i422_yuy2.c b/modules/video_chroma/i422_yuy2.c
index 87e10f0065050c5c5288680c37f55291b4c3e5a8..9d86ec6cfab416c99843c1343a45d64183843565 100644 (file)
--- a/modules/video_chroma/i422_yuy2.c
+++ b/modules/video_chroma/i422_yuy2.c
@@ -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 )