vdpau: create a libgstvdp library.

The library contains GstVdpDevice GstVdpVideoBuffer and GstVdpOutputBuffer. The
library will (apart from the plugins here) be used by the upcoming gst-ffmpeg
vdpau support.

11 files changed, 31 insertions, 24 deletions

diff --git a/sys/vdpau/Makefile.am b/sys/vdpau/Makefile.am
index 9d916eb82..0da45abdc 100644
--- a/sys/vdpau/Makefile.am
+++ b/sys/vdpau/Makefile.am
@@ -1,35 +1,47 @@
 plugin_LTLIBRARIES = libgstvdpau.la
 
 libgstvdpau_la_SOURCES = \
-	gstvdpdevice.c \
 	gstvdpmpegdec.c \
 	mpegutil.c \
 	gstvdpvideoyuv.c \
-	gstvdpvideobuffer.c \
 	gstvdp.c \
 	gstvdpyuvvideo.c \
 	gstvdputils.c \
 	gstvdpvideopostprocess.c \
-	gstvdpoutputbuffer.c \
 	gstvdpsink.c
 
 libgstvdpau_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X11_CFLAGS) $(VDPAU_CFLAGS)
 libgstvdpau_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \
-	$(GST_PLUGINS_BASE_LIBS) $(X11_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \
-	$(VDPAU_LIBS)
+	$(GST_PLUGINS_BASE_LIBS) $(X11_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+	-lgstinterfaces-$(GST_MAJORMINOR) $(VDPAU_LIBS) -lgstvdp-$(GST_MAJORMINOR)
 libgstvdpau_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvdpau_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = \
-	gstvdpdevice.h \
 	gstvdpmpegdec.h \
 	mpegutil.h \
 	gstvdpvideoyuv.h \
-	gstvdpvideobuffer.h \
 	gstvdpyuvvideo.h \
 	gstvdputils.h \
 	gstvdpvideopostprocess.h \
-	gstvdpoutputbuffer.h \
 	gstvdpsink.h
 	
+lib_LTLIBRARIES = libgstvdp-@GST_MAJORMINOR@.la
+ 
+libgstvdp_@GST_MAJORMINOR@_la_SOURCES = \
+	gstvdpdevice.c \
+	gstvdpvideobuffer.c \
+	gstvdpoutputbuffer.c
+	
+libgstvdp_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/vdpau
+libgstvdp_@GST_MAJORMINOR@include_HEADERS = \
+	gstvdpdevice.h \
+	gstvdpvideobuffer.h \
+	gstvdpoutputbuffer.h
+ 
+libgstvdp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(VDPAU_CFLAGS) $(X11_CFLAGS)
+libgstvdp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(VDPAU_LIBS) $(X11_LIBS)
+libgstvdp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_LT_LDFLAGS) $(GST_ALL_LDFLAGS)
+libgstvdp_@GST_MAJORMINOR@_la_LIBTOOLFLAGS = --tag=disable-static
+	
 
diff --git a/sys/vdpau/gstvdpmpegdec.c b/sys/vdpau/gstvdpmpegdec.c
index ca05b2f22..3bc03484a 100644
--- a/sys/vdpau/gstvdpmpegdec.c
+++ b/sys/vdpau/gstvdpmpegdec.c
@@ -38,6 +38,7 @@
 #include <gst/gst.h>
 #include <gst/base/gstbytereader.h>
 #include <gst/base/gstbitreader.h>
+#include <gst/vdpau/gstvdpvideobuffer.h>
 #include <string.h>
 
 #include "mpegutil.h"
diff --git a/sys/vdpau/gstvdpmpegdec.h b/sys/vdpau/gstvdpmpegdec.h
index 174bf3e69..6e99e39e4 100644
--- a/sys/vdpau/gstvdpmpegdec.h
+++ b/sys/vdpau/gstvdpmpegdec.h
@@ -23,9 +23,7 @@
 
 #include <gst/gst.h>
 #include <gst/base/gstadapter.h>
-
-#include "gstvdpdevice.h"
-#include "gstvdpvideobuffer.h"
+#include <gst/vdpau/gstvdpdevice.h>
 
 G_BEGIN_DECLS
 
diff --git a/sys/vdpau/gstvdputils.c b/sys/vdpau/gstvdputils.c
index 7602225f5..7f19424fc 100644
--- a/sys/vdpau/gstvdputils.c
+++ b/sys/vdpau/gstvdputils.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "gstvdpvideobuffer.h"
+#include <gst/vdpau/gstvdpvideobuffer.h>
 
 #include "gstvdputils.h"
 
diff --git a/sys/vdpau/gstvdputils.h b/sys/vdpau/gstvdputils.h
index 5d9e9012d..d74287156 100644
--- a/sys/vdpau/gstvdputils.h
+++ b/sys/vdpau/gstvdputils.h
@@ -22,8 +22,7 @@
 #define _GST_VDP_UTILS_H_
 
 #include <gst/gst.h>
-
-#include "gstvdpdevice.h"
+#include <gst/vdpau/gstvdpdevice.h>
 
 GstCaps  *gst_vdp_video_to_yuv_caps  (GstCaps *caps, GstVdpDevice *device);
 GstCaps  *gst_vdp_yuv_to_video_caps  (GstCaps *caps, GstVdpDevice *device);
diff --git a/sys/vdpau/gstvdpvideopostprocess.c b/sys/vdpau/gstvdpvideopostprocess.c
index 564d87210..c942000e8 100644
--- a/sys/vdpau/gstvdpvideopostprocess.c
+++ b/sys/vdpau/gstvdpvideopostprocess.c
@@ -44,10 +44,9 @@
 
 #include <gst/gst.h>
 #include <gst/video/gstvideosink.h>
+#include <gst/vdpau/gstvdpoutputbuffer.h>
 
 #include "gstvdputils.h"
-#include "gstvdpvideobuffer.h"
-#include "gstvdpoutputbuffer.h"
 
 #include "gstvdpvideopostprocess.h"
 
diff --git a/sys/vdpau/gstvdpvideopostprocess.h b/sys/vdpau/gstvdpvideopostprocess.h
index be9ad1b92..db9a0e3ee 100644
--- a/sys/vdpau/gstvdpvideopostprocess.h
+++ b/sys/vdpau/gstvdpvideopostprocess.h
@@ -22,8 +22,8 @@
 #define __GST_VDP_VIDEO_POST_PROCESS_H__
 
 #include <gst/gst.h>
-
-#include "gstvdpdevice.h"
+#include <gst/vdpau/gstvdpdevice.h>
+#include <gst/vdpau/gstvdpvideobuffer.h>
 
 G_BEGIN_DECLS
 
diff --git a/sys/vdpau/gstvdpvideoyuv.c b/sys/vdpau/gstvdpvideoyuv.c
index 95d9e2998..c01d55935 100644
--- a/sys/vdpau/gstvdpvideoyuv.c
+++ b/sys/vdpau/gstvdpvideoyuv.c
@@ -24,8 +24,8 @@
 
 #include <gst/gst.h>
 #include <gst/video/video.h>
+#include <gst/vdpau/gstvdpvideobuffer.h>
 
-#include "gstvdpvideobuffer.h"
 #include "gstvdputils.h"
 #include "gstvdpvideoyuv.h"
 
diff --git a/sys/vdpau/gstvdpvideoyuv.h b/sys/vdpau/gstvdpvideoyuv.h
index 9e6ec1222..43f505de9 100644
--- a/sys/vdpau/gstvdpvideoyuv.h
+++ b/sys/vdpau/gstvdpvideoyuv.h
@@ -23,8 +23,7 @@
 
 #include <gst/gst.h>
 #include <gst/base/gstbasetransform.h>
-
-#include "gstvdpdevice.h"
+#include <gst/vdpau/gstvdpdevice.h>
 
 G_BEGIN_DECLS
 
diff --git a/sys/vdpau/gstvdpyuvvideo.c b/sys/vdpau/gstvdpyuvvideo.c
index 132b7f152..e2e5c744f 100644
--- a/sys/vdpau/gstvdpyuvvideo.c
+++ b/sys/vdpau/gstvdpyuvvideo.c
@@ -24,8 +24,8 @@
 
 #include <gst/gst.h>
 #include <gst/video/video.h>
+#include <gst/vdpau/gstvdpvideobuffer.h>
 
-#include "gstvdpvideobuffer.h"
 #include "gstvdputils.h"
 #include "gstvdpyuvvideo.h"
 
diff --git a/sys/vdpau/gstvdpyuvvideo.h b/sys/vdpau/gstvdpyuvvideo.h
index e1fd31f79..158077151 100644
--- a/sys/vdpau/gstvdpyuvvideo.h
+++ b/sys/vdpau/gstvdpyuvvideo.h
@@ -23,8 +23,7 @@
 
 #include <gst/gst.h>
 #include <gst/base/gstbasetransform.h>
-
-#include "gstvdpdevice.h"
+#include <gst/vdpau/gstvdpdevice.h>
 
 G_BEGIN_DECLS