diff options
24 files changed, 55 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index 5657afa92..27084affb 100644 --- a/configure.ac +++ b/configure.ac @@ -3763,6 +3763,7 @@ gst-libs/gst/base/Makefile gst-libs/gst/player/Makefile gst-libs/gst/video/Makefile gst-libs/gst/audio/Makefile +gst-libs/gst/opencv/Makefile sys/Makefile sys/dshowdecwrapper/Makefile sys/acmenc/Makefile diff --git a/ext/opencv/Makefile.am b/ext/opencv/Makefile.am index 360d4abd2..02a77ea62 100644 --- a/ext/opencv/Makefile.am +++ b/ext/opencv/Makefile.am @@ -2,8 +2,6 @@ plugin_LTLIBRARIES = libgstopencv.la # sources used to compile this plug-in libgstopencv_la_SOURCES = gstopencv.cpp \ - gstopencvvideofilter.cpp \ - gstopencvutils.cpp \ gstcvdilate.cpp \ gstcvdilateerode.cpp \ gstcvequalizehist.cpp \ @@ -26,7 +24,10 @@ libgstopencv_la_SOURCES = gstopencv.cpp \ motioncells_wrapper.cpp \ MotionCells.cpp -libgstopencv_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(OPENCV_CFLAGS) \ +libgstopencv_la_CXXFLAGS = \ + -I$(top_srcdir)/gst-libs \ + -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(OPENCV_CFLAGS) \ -DGST_HAAR_CASCADES_DIR=\"$(pkgdatadir)/@GST_API_VERSION@/opencv_haarcascades\" # flags used to compile this facedetect @@ -39,14 +40,16 @@ libgstopencv_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ -DCV_INLINE="static inline" \ -DCV_NO_BACKWARD_COMPATIBILITY -libgstopencv_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(OPENCV_LIBS) \ - $(GSTPB_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) +libgstopencv_la_LIBADD = \ + $(top_builddir)/gst-libs/gst/opencv/libgstopencv-$(GST_API_VERSION).la \ + $(GST_LIBS) $(GST_BASE_LIBS) $(OPENCV_LIBS) \ + $(GSTPB_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) libgstopencv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstopencv_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) # headers we need but don't want installed -noinst_HEADERS = gstopencvvideofilter.h gstopencvutils.h \ +noinst_HEADERS = \ gstcvdilateerode.h \ gstcvdilate.h \ gstcvequalizehist.h \ diff --git a/ext/opencv/gstcvdilateerode.cpp b/ext/opencv/gstcvdilateerode.cpp index 69a4169e8..f12c9915b 100644 --- a/ext/opencv/gstcvdilateerode.cpp +++ b/ext/opencv/gstcvdilateerode.cpp @@ -50,7 +50,7 @@ # include <config.h> #endif -#include "gstopencvutils.h" +#include "gst/opencv/gstopencvutils.h" #include "gstcvdilateerode.h" /* diff --git a/ext/opencv/gstcvdilateerode.h b/ext/opencv/gstcvdilateerode.h index bd2aa7c24..69bccdb3f 100644 --- a/ext/opencv/gstcvdilateerode.h +++ b/ext/opencv/gstcvdilateerode.h @@ -44,7 +44,7 @@ #ifndef __GST_CV_DILATE_ERODE_H__ #define __GST_CV_DILATE_ERODE_H__ -#include <gstopencvvideofilter.h> +#include <gst/opencv/gstopencvvideofilter.h> G_BEGIN_DECLS diff --git a/ext/opencv/gstcvequalizehist.h b/ext/opencv/gstcvequalizehist.h index c185994b8..6c58c0125 100644 --- a/ext/opencv/gstcvequalizehist.h +++ b/ext/opencv/gstcvequalizehist.h @@ -44,7 +44,7 @@ #ifndef __GST_CV_EQUALIZE_HIST_H__ #define __GST_CV_EQUALIZE_HIST_H__ -#include <gstopencvvideofilter.h> +#include <gst/opencv/gstopencvvideofilter.h> G_BEGIN_DECLS diff --git a/ext/opencv/gstcvlaplace.h b/ext/opencv/gstcvlaplace.h index 82f237f34..7163695c9 100644 --- a/ext/opencv/gstcvlaplace.h +++ b/ext/opencv/gstcvlaplace.h @@ -44,7 +44,7 @@ #ifndef __GST_CV_LAPLACE_H__ #define __GST_CV_LAPLACE_H__ -#include <gstopencvvideofilter.h> +#include <gst/opencv/gstopencvvideofilter.h> G_BEGIN_DECLS diff --git a/ext/opencv/gstcvsmooth.cpp b/ext/opencv/gstcvsmooth.cpp index f9a8a02bb..72c6f4241 100644 --- a/ext/opencv/gstcvsmooth.cpp +++ b/ext/opencv/gstcvsmooth.cpp @@ -58,7 +58,7 @@ # include <config.h> #endif -#include "gstopencvutils.h" +#include "gst/opencv/gstopencvutils.h" #include "gstcvsmooth.h" #include <opencv2/imgproc/imgproc.hpp> diff --git a/ext/opencv/gstcvsmooth.h b/ext/opencv/gstcvsmooth.h index 7c74fbd57..237f76ee5 100644 --- a/ext/opencv/gstcvsmooth.h +++ b/ext/opencv/gstcvsmooth.h @@ -44,7 +44,7 @@ #ifndef __GST_CV_SMOOTH_H__ #define __GST_CV_SMOOTH_H__ -#include <gstopencvvideofilter.h> +#include <gst/opencv/gstopencvvideofilter.h> G_BEGIN_DECLS diff --git a/ext/opencv/gstcvsobel.h b/ext/opencv/gstcvsobel.h index 62cabab4a..ffe78d81a 100644 --- a/ext/opencv/gstcvsobel.h +++ b/ext/opencv/gstcvsobel.h @@ -44,7 +44,7 @@ #ifndef __GST_CV_SOBEL_H__ #define __GST_CV_SOBEL_H__ -#include <gstopencvvideofilter.h> +#include <gst/opencv/gstopencvvideofilter.h> G_BEGIN_DECLS diff --git a/ext/opencv/gstedgedetect.h b/ext/opencv/gstedgedetect.h index 0472c5db5..ff6226689 100644 --- a/ext/opencv/gstedgedetect.h +++ b/ext/opencv/gstedgedetect.h @@ -46,7 +46,7 @@ #ifndef __GST_EDGE_DETECT_H__ #define __GST_EDGE_DETECT_H__ -#include <gstopencvvideofilter.h> +#include <gst/opencv/gstopencvvideofilter.h> #include <opencv2/core/core_c.h> G_BEGIN_DECLS diff --git a/ext/opencv/gstfaceblur.h b/ext/opencv/gstfaceblur.h index 9c86e1bdb..732276d44 100644 --- a/ext/opencv/gstfaceblur.h +++ b/ext/opencv/gstfaceblur.h @@ -50,7 +50,7 @@ #include <gst/gst.h> #include <opencv2/core/version.hpp> -#include "gstopencvvideofilter.h" +#include <gst/opencv/gstopencvvideofilter.h> #include <opencv2/objdetect/objdetect.hpp> G_BEGIN_DECLS diff --git a/ext/opencv/gstfacedetect.h b/ext/opencv/gstfacedetect.h index 3c5acf364..03cf81c2e 100644 --- a/ext/opencv/gstfacedetect.h +++ b/ext/opencv/gstfacedetect.h @@ -51,7 +51,7 @@ #include <gst/gst.h> #include <opencv2/core/version.hpp> #include <cv.h> -#include "gstopencvvideofilter.h" +#include <gst/opencv/gstopencvvideofilter.h> #include <opencv2/objdetect/objdetect.hpp> G_BEGIN_DECLS diff --git a/ext/opencv/gsthanddetect.h b/ext/opencv/gsthanddetect.h index 39308c81e..1137c5aa9 100644 --- a/ext/opencv/gsthanddetect.h +++ b/ext/opencv/gsthanddetect.h @@ -47,7 +47,7 @@ #include <cv.h> -#include "gstopencvvideofilter.h" +#include <gst/opencv/gstopencvvideofilter.h> /* opencv */ #include <opencv2/core/version.hpp> #ifdef HAVE_HIGHGUI_H diff --git a/ext/opencv/gstmotioncells.h b/ext/opencv/gstmotioncells.h index da04a741a..00352cfab 100644 --- a/ext/opencv/gstmotioncells.h +++ b/ext/opencv/gstmotioncells.h @@ -45,7 +45,7 @@ #ifndef __GST_MOTIONCELLS_H__ #define __GST_MOTIONCELLS_H__ -#include <gstopencvvideofilter.h> +#include <gst/opencv/gstopencvvideofilter.h> #include <opencv2/core/core_c.h> #include "motioncells_wrapper.h" diff --git a/ext/opencv/gstretinex.h b/ext/opencv/gstretinex.h index d090a5b8f..54c0ef97e 100644 --- a/ext/opencv/gstretinex.h +++ b/ext/opencv/gstretinex.h @@ -46,7 +46,7 @@ #include <opencv2/core/core_c.h> -#include <gstopencvvideofilter.h> +#include <gst/opencv/gstopencvvideofilter.h> G_BEGIN_DECLS /* #defines don't like whitespacey bits */ diff --git a/ext/opencv/gstskindetect.h b/ext/opencv/gstskindetect.h index a9c548d05..2337c6a31 100644 --- a/ext/opencv/gstskindetect.h +++ b/ext/opencv/gstskindetect.h @@ -46,7 +46,7 @@ #ifndef __GST_SKIN_DETECT_H__ #define __GST_SKIN_DETECT_H__ -#include <gstopencvvideofilter.h> +#include <gst/opencv/gstopencvvideofilter.h> G_BEGIN_DECLS /* #defines don't like whitespacey bits */ diff --git a/ext/opencv/gsttemplatematch.h b/ext/opencv/gsttemplatematch.h index e7c020203..f27d9f3dd 100644 --- a/ext/opencv/gsttemplatematch.h +++ b/ext/opencv/gsttemplatematch.h @@ -46,7 +46,7 @@ #ifndef __GST_TEMPLATE_MATCH_H__ #define __GST_TEMPLATE_MATCH_H__ -#include <gstopencvvideofilter.h> +#include <gst/opencv/gstopencvvideofilter.h> #ifdef HAVE_HIGHGUI_H #include <highgui.h> // includes highGUI definitions diff --git a/ext/opencv/gsttextoverlay.h b/ext/opencv/gsttextoverlay.h index 13d09fa96..794cd7973 100644 --- a/ext/opencv/gsttextoverlay.h +++ b/ext/opencv/gsttextoverlay.h @@ -46,7 +46,7 @@ #ifndef __GST_OPENCV_TEXT_OVERLAY_H__ #define __GST_OPENCV_TEXT_OVERLAY_H__ -#include <gstopencvvideofilter.h> +#include <gst/opencv/gstopencvvideofilter.h> #include <opencv2/core/core_c.h> #if (CV_MAJOR_VERSION >= 3) #include <opencv2/imgproc/imgproc_c.h> diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am index 7d0b30925..92130cdce 100644 --- a/gst-libs/gst/Makefile.am +++ b/gst-libs/gst/Makefile.am @@ -10,12 +10,17 @@ if USE_WAYLAND WAYLAND_DIR=wayland endif +if USE_OPENCV +OPENCV_DIR=opencv +endif + SUBDIRS = uridownloader adaptivedemux interfaces basecamerabinsrc codecparsers \ - insertbin mpegts base video audio player $(GL_DIR) $(WAYLAND_DIR) + insertbin mpegts base video audio player $(GL_DIR) $(WAYLAND_DIR) \ + $(OPENCV_DIR) noinst_HEADERS = gst-i18n-plugin.h gettext.h glib-compat-private.h DIST_SUBDIRS = uridownloader adaptivedemux interfaces gl basecamerabinsrc \ - codecparsers insertbin mpegts wayland base video audio player + codecparsers insertbin mpegts wayland opencv base video audio player #dependencies video, audio: base @@ -24,7 +29,7 @@ adaptivedemux: uridownloader INDEPENDENT_SUBDIRS = \ interfaces basecamerabinsrc codecparsers insertbin uridownloader \ - mpegts base player $(GL_DIR) $(WAYLAND_DIR) + mpegts base player $(GL_DIR) $(WAYLAND_DIR) $(OPENCV_DIR) .PHONY: independent-subdirs $(INDEPENDENT_SUBDIRS) diff --git a/gst-libs/gst/opencv/Makefile.am b/gst-libs/gst/opencv/Makefile.am new file mode 100644 index 000000000..9d18a5fc5 --- /dev/null +++ b/gst-libs/gst/opencv/Makefile.am @@ -0,0 +1,21 @@ +lib_LTLIBRARIES = libgstopencv-@GST_API_VERSION@.la + +libgstopencv_@GST_API_VERSION@_la_SOURCES = \ + gstopencvutils.cpp \ + gstopencvvideofilter.cpp + +libgstopencv_@GST_API_VERSION@_la_CXXFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) \ + $(OPENCV_CFLAGS) + +libgstopencv_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \ + $(OPENCV_LIBS) -lgstvideo-$(GST_API_VERSION) + +libgstopencv_@GST_API_VERSION@_la_LDFLAGS = \ + $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) + +libgstopencv_@GST_API_VERSION@includedir = \ + $(includedir)/gstreamer-@GST_API_VERSION@/gst/opencv +libgstopencv_@GST_API_VERSION@include_HEADERS = \ + gstopencvutils.h \ + gstopencvvideofilter.h diff --git a/ext/opencv/gstopencvutils.cpp b/gst-libs/gst/opencv/gstopencvutils.cpp index 640486be1..640486be1 100644 --- a/ext/opencv/gstopencvutils.cpp +++ b/gst-libs/gst/opencv/gstopencvutils.cpp diff --git a/ext/opencv/gstopencvutils.h b/gst-libs/gst/opencv/gstopencvutils.h index 13dfd9e07..13dfd9e07 100644 --- a/ext/opencv/gstopencvutils.h +++ b/gst-libs/gst/opencv/gstopencvutils.h diff --git a/ext/opencv/gstopencvvideofilter.cpp b/gst-libs/gst/opencv/gstopencvvideofilter.cpp index 4b8e53670..4b8e53670 100644 --- a/ext/opencv/gstopencvvideofilter.cpp +++ b/gst-libs/gst/opencv/gstopencvvideofilter.cpp diff --git a/ext/opencv/gstopencvvideofilter.h b/gst-libs/gst/opencv/gstopencvvideofilter.h index 7fbafe932..7fbafe932 100644 --- a/ext/opencv/gstopencvvideofilter.h +++ b/gst-libs/gst/opencv/gstopencvvideofilter.h |