cog: use common/orc.mak

configure.ac

@@ -227,6 +227,32 @@ if test "x$HAVE_X11" = "xyes"; then
   AC_DEFINE(HAVE_X11, 1, [Define if you have X11 library])
 fi
 
+dnl Orc
+AC_ARG_ENABLE(orc,
+AC_HELP_STRING([--enable-orc],[use Orc if installed]),
+[case "${enableval}" in
+  yes) enable_orc=yes ;;
+  no)  enable_orc=no ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-orc) ;;
+esac
+],
+[enable_orc=yes]) dnl Default value
+
+if test "x$enable_orc" = "xyes" ; then
+  PKG_CHECK_MODULES(ORC, orc-0.4 >= 0.4.0, HAVE_ORC=yes, HAVE_ORC=no)
+  if test "x$HAVE_ORC" != "xyes"; then
+    AC_ERROR([orc-0.4.0 or later is required])
+  fi
+  AC_DEFINE(HAVE_ORC, 1, [Use Orc])
+
+  ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
+  AC_SUBST(ORCC)
+else
+  AC_DEFINE(DISABLE_ORC, 1, [Disable Orc])
+  HAVE_ORC=no
+fi
+AM_CONDITIONAL(HAVE_ORC, test "x$HAVE_ORC" = "xyes")
+
 dnl set license and copyright notice
 GST_LICENSE="LGPL"
 AC_DEFINE_UNQUOTED(GST_LICENSE, "$GST_LICENSE", [GStreamer license])
@@ -594,11 +620,7 @@ AG_GST_CHECK_FEATURE(COG, [Cog plugin], cog, [
   ])
   AC_SUBST(COG_CFLAGS)
   AC_SUBST(COG_LIBS)
-  ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
-  if test "x$ORCC" = x ; then
-    ORCC=orcc
-  fi
-  AC_SUBST(ORCC)
+  dnl ORCC was set up by Orc check above
 ])
 
 dnl *** dc1394  ***

ext/cog/Makefile.am

@@ -1,5 +1,8 @@
 plugin_LTLIBRARIES = libgstcog.la
 
+ORC_SOURCE=gstcogorc
+include $(top_srcdir)/common/orc.mak
+
 libgstcog_la_CFLAGS = \
 	-DCOG_ENABLE_UNSTABLE_API \
 	-I$(srcdir)/.. \
@@ -34,21 +37,11 @@ libgstcog_la_SOURCES = \
 	gstlogoinsert.c \
 	gstcms.h \
 	gstcms.c
+nodist_libgstcog_la_SOURCES = $(ORC_NODIST_SOURCES)
 
 noinst_PROGRAMS = generate_tables
 generate_tables_SOURCES = generate_tables.c gstcms.c
 generate_tables_CFLAGS = $(GST_CFLAGS)
 generate_tables_LDADD = $(GST_LIBS) $(LIBM)
 
-nodist_libgstcog_la_SOURCES = cogorc.c cogorc.h
-BUILT_SOURCES = cogorc.c cogorc.h
-CLEANFILES = cogorc.c cogorc.h
-
-EXTRA_DIST=cog.orc
-
-cogorc.c: $(srcdir)/cog.orc
-	$(AM_V_GEN)$(ORCC) --include cogorc.h --implementation -o cogorc.c $(srcdir)/cog.orc
-
-cogorc.h: $(srcdir)/cog.orc
-	$(AM_V_GEN)$(ORCC) --header -o cogorc.h $(srcdir)/cog.orc
 

ext/cog/cogframe.c

@@ -7,7 +7,7 @@
 #include <cog/cog.h>
 #include <cog/cogframe.h>
 #include <cog/cogvirtframe.h>
-#include "cogorc.h"
+#include "gstcogorc.h"
 #include <gst/gst.h>
 
 #include <stdlib.h>

ext/cog/cogvirtframe.c

@@ -12,7 +12,7 @@
 #include <orc/orc.h>
 #include <gst/gst.h>
 
-#include "cogorc.h"
+#include "gstcogorc.h"
 
 extern gint8 cog_resample_table_4tap[256][4];
 

ext/cog/gstcogorc-dist.h

@@ -0,0 +1,55 @@
+
+/* autogenerated from gstcogorc.orc */
+
+#ifndef _GSTCOGORC_H_
+#define _GSTCOGORC_H_
+
+#include <glib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void cogorc_downsample_horiz_cosite_1tap (uint8_t * d1, const uint16_t * s1, int n);
+void cogorc_downsample_horiz_cosite_3tap (uint8_t * d1, const uint16_t * s1, const uint16_t * s2, int n);
+void cogorc_downsample_420_jpeg (uint8_t * d1, const uint16_t * s1, const uint16_t * s2, int n);
+void cogorc_downsample_vert_halfsite_2tap (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, int n);
+void cogorc_downsample_vert_cosite_3tap (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int n);
+void cogorc_downsample_vert_halfsite_4tap (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, const uint8_t * s4, int n);
+void cogorc_upsample_horiz_cosite_1tap (uint8_t * d1, const uint8_t * s1, int n);
+void cogorc_upsample_horiz_cosite (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, int n);
+void cogorc_upsample_vert_avgub (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, int n);
+void orc_unpack_yuyv_y (uint8_t * d1, const uint16_t * s1, int n);
+void orc_unpack_yuyv_u (uint8_t * d1, const uint32_t * s1, int n);
+void orc_unpack_yuyv_v (uint8_t * d1, const uint32_t * s1, int n);
+void orc_pack_yuyv (uint32_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int n);
+void orc_unpack_uyvy_y (uint8_t * d1, const uint16_t * s1, int n);
+void orc_unpack_uyvy_u (uint8_t * d1, const uint32_t * s1, int n);
+void orc_unpack_uyvy_v (uint8_t * d1, const uint32_t * s1, int n);
+void orc_pack_uyvy (uint32_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int n);
+void orc_addc_convert_u8_s16 (uint8_t * d1, const int16_t * s1, int n);
+void orc_subc_convert_s16_u8 (int16_t * d1, const uint8_t * s1, int n);
+void orc_splat_u8_ns (uint8_t * d1, int p1, int n);
+void orc_splat_s16_ns (int16_t * d1, int p1, int n);
+void orc_matrix2_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, int p1, int p2, int p3, int n);
+void orc_matrix2_11_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, int p1, int p2, int n);
+void orc_matrix2_12_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, int p1, int p2, int n);
+void orc_matrix3_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int p1, int p2, int p3, int p4, int n);
+void orc_matrix3_100_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int p1, int p2, int p3, int n);
+void orc_matrix3_100_offset_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int p1, int p2, int p3, int p4, int p5, int n);
+void orc_matrix3_000_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int p1, int p2, int p3, int p4, int p5, int n);
+void orc_pack_123x (uint32_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int p1, int n);
+void orc_pack_x123 (uint32_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int p1, int n);
+void cogorc_combine2_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, int p1, int p2, int n);
+void cogorc_combine4_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, const uint8_t * s4, int p1, int p2, int p3, int p4, int n);
+void cogorc_unpack_axyz_0 (uint8_t * d1, const uint32_t * s1, int n);
+void cogorc_unpack_axyz_1 (uint8_t * d1, const uint32_t * s1, int n);
+void cogorc_unpack_axyz_2 (uint8_t * d1, const uint32_t * s1, int n);
+void cogorc_unpack_axyz_3 (uint8_t * d1, const uint32_t * s1, int n);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+