[vlc-commits] sse2: merge back into video_chroma (refs #9367)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep 14 16:20:09 2013 +0300| [4c7fcb01d7635b5b8b5f7eb1b173277090b9443b] | committer: Rémi Denis-Courmont

sse2: merge back into video_chroma (refs #9367)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4c7fcb01d7635b5b8b5f7eb1b173277090b9443b
---

 configure.ac                                   |    1 -
 modules/Makefile.am                            |    4 ---
 modules/sse2/Makefile.am                       |   37 ------------------------
 modules/video_chroma/Makefile.am               |   18 ++++++++++++
 modules/video_chroma/i420_rgb16.c              |    2 +-
 modules/{sse2 => video_chroma}/i420_rgb_sse2.h |    0
 6 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/configure.ac b/configure.ac
index 969f0a3..6be2744 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4277,7 +4277,6 @@ AC_CONFIG_FILES([
   modules/video_output/Makefile
   modules/video_splitter/Makefile
   modules/visualization/Makefile
-  modules/sse2/Makefile
   modules/altivec/Makefile
   modules/arm_neon/Makefile
   modules/hw/vdpau/Makefile
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 2b425ae..8cb564f 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -24,7 +24,6 @@ EXTRA_SUBDIRS = \
 	access_output \
 	mux \
 	stream_out \
-	sse2 \
 	altivec \
 	arm_neon \
 	hw/vdpau \
@@ -35,9 +34,6 @@ DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 if ENABLE_SOUT
 SUBDIRS += access_output mux stream_out
 endif
-if HAVE_SSE2
-SUBDIRS += sse2
-endif
 if HAVE_ALTIVEC
 SUBDIRS += altivec
 endif
diff --git a/modules/sse2/Makefile.am b/modules/sse2/Makefile.am
deleted file mode 100644
index b771db9..0000000
--- a/modules/sse2/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-basedir = sse2
-include $(top_srcdir)/modules/common.am
-
-libi420_rgb_sse2_plugin_la_SOURCES = \
-        ../video_chroma/i420_rgb.c \
-	../video_chroma/i420_rgb.h \
-        ../video_chroma/i420_rgb16.c \
-        ../sse2/i420_rgb_sse2.h
-libi420_rgb_sse2_plugin_la_CFLAGS = $(AM_CFLAGS)
-libi420_rgb_sse2_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libi420_rgb_sse2_plugin_la_DEPENDENCIES = libi420_rgb_sse2_plugin.rc.o
-endif
-
-libi420_yuy2_sse2_plugin_la_SOURCES = \
-        ../video_chroma/i420_yuy2.c \
-	../video_chroma/i420_yuy2.h
-libi420_yuy2_sse2_plugin_la_CFLAGS = $(AM_CFLAGS)
-libi420_yuy2_sse2_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libi420_yuy2_sse2_plugin_la_DEPENDENCIES = libi420_yuy2_sse2_plugin.rc.o
-endif
-
-libi422_yuy2_sse2_plugin_la_SOURCES = \
-        ../video_chroma/i422_yuy2.c \
-	../video_chroma/i422_yuy2.h
-libi422_yuy2_sse2_plugin_la_CFLAGS = $(AM_CFLAGS)
-libi422_yuy2_sse2_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libi422_yuy2_sse2_plugin_la_DEPENDENCIES = libi422_yuy2_sse2_plugin.rc.o
-endif
-
-libvlc_LTLIBRARIES = \
-	libi420_rgb_sse2_plugin.la \
-	libi420_yuy2_sse2_plugin.la \
-	libi422_yuy2_sse2_plugin.la
diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am
index 20f0000..e2fb3c2 100644
--- a/modules/video_chroma/Makefile.am
+++ b/modules/video_chroma/Makefile.am
@@ -71,3 +71,21 @@ libvlc_LTLIBRARIES += \
 	libi420_yuy2_mmx_plugin.la \
 	libi422_yuy2_mmx_plugin.la
 endif
+
+# SSE2
+libi420_rgb_sse2_plugin_la_SOURCES = i420_rgb.c i420_rgb.h \
+	i420_rgb16.c i420_rgb_sse2.h
+libi420_rgb_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libi420_yuy2_sse2_plugin_la_SOURCES = i420_yuy2.c i420_yuy2.h
+libi420_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libi422_yuy2_sse2_plugin_la_SOURCES = i422_yuy2.c i422_yuy2.h
+libi422_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+if HAVE_SSE2
+libvlc_LTLIBRARIES += \
+	libi420_rgb_sse2_plugin.la \
+	libi420_yuy2_sse2_plugin.la \
+	libi422_yuy2_sse2_plugin.la
+endif
diff --git a/modules/video_chroma/i420_rgb16.c b/modules/video_chroma/i420_rgb16.c
index c092333..2a21133 100644
--- a/modules/video_chroma/i420_rgb16.c
+++ b/modules/video_chroma/i420_rgb16.c
@@ -42,7 +42,7 @@
 #   include "i420_rgb_mmx.h"
 #   define VLC_TARGET VLC_MMX
 #elif defined (MODULE_NAME_IS_i420_rgb_sse2)
-#   include "../sse2/i420_rgb_sse2.h"
+#   include "i420_rgb_sse2.h"
 #   define VLC_TARGET VLC_SSE
 #endif
 
diff --git a/modules/sse2/i420_rgb_sse2.h b/modules/video_chroma/i420_rgb_sse2.h
similarity index 100%
rename from modules/sse2/i420_rgb_sse2.h
rename to modules/video_chroma/i420_rgb_sse2.h