videomixer: liboil to orc conversion

diff --git a/gst/videomixer/Makefile.am b/gst/videomixer/Makefile.am
index c6d7cb1..eeaa184 100644 (file)
--- a/gst/videomixer/Makefile.am
+++ b/gst/videomixer/Makefile.am
@@ -2,9 +2,9 @@ plugin_LTLIBRARIES = libgstvideomixer.la
 
 libgstvideomixer_la_SOURCES = videomixer.c blend.c
 libgstvideomixer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
-       $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS)
+       $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
 libgstvideomixer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
-       $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(LIBOIL_LIBS)
+       $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(ORC_LIBS)
 libgstvideomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideomixer_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/videomixer/blend.c b/gst/videomixer/blend.c
index a5c95af..ebc3816 100644 (file)
--- a/gst/videomixer/blend.c
+++ b/gst/videomixer/blend.c
@@ -28,18 +28,17 @@
 
 #include "blend.h"
 
-#include <liboil/liboil.h>
-#include <liboil/liboilcpu.h>
-#include <liboil/liboilfunction.h>
-
 #include <string.h>
 
 #include <gst/video/video.h>
+#ifdef HAVE_ORC
+#include <orc/orc.h>
+#endif
 
 #define BLEND(D,S,alpha) (((D) * (256 - (alpha)) + (S) * (alpha)) >> 8)
 
 #ifdef HAVE_GCC_ASM
-#if defined(HAVE_CPU_I386) || defined(HAVE_CPU_X86_64)
+#if defined(HAVE_ORC) && (defined(HAVE_CPU_I386) || defined(HAVE_CPU_X86_64))
 #define BUILD_X86_ASM
 
 #define GENERIC
@@ -849,10 +848,12 @@ FillColorFunction gst_video_mixer_fill_color_uyvy;
 void
 gst_video_mixer_init_blend (void)
 {
+#ifdef BUILD_X86_ASM
   guint cpu_flags;
 
-  oil_init ();
-  cpu_flags = oil_cpu_get_flags ();
+  orc_init ();
+  cpu_flags = orc_target_get_default_flags (orc_target_get_by_name ("mmx"));
+#endif
 
   gst_video_mixer_blend_argb = blend_argb_c;
   gst_video_mixer_blend_bgra = blend_bgra_c;
@@ -897,7 +898,7 @@ gst_video_mixer_init_blend (void)
   gst_video_mixer_fill_color_uyvy = fill_color_uyvy_c;
 
 #ifdef BUILD_X86_ASM
-  if (cpu_flags & OIL_IMPL_FLAG_MMX) {
+  if (cpu_flags & ORC_TARGET_MMX_MMX) {
     gst_video_mixer_blend_argb = blend_argb_mmx;
     gst_video_mixer_blend_bgra = blend_bgra_mmx;
     gst_video_mixer_blend_i420 = blend_i420_mmx;