From 79c600f7be7ad4f49ebf30531772b2768c85a1bb Mon Sep 17 00:00:00 2001 From: Carl-Anton Ingmarsson Date: Sun, 4 Oct 2009 19:27:56 +0200 Subject: [PATCH] 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. --- sys/vdpau/Makefile.am | 28 ++++++++++++++++++++-------- sys/vdpau/gstvdpmpegdec.c | 1 + sys/vdpau/gstvdpmpegdec.h | 4 +--- sys/vdpau/gstvdputils.c | 2 +- sys/vdpau/gstvdputils.h | 3 +-- sys/vdpau/gstvdpvideopostprocess.c | 3 +-- sys/vdpau/gstvdpvideopostprocess.h | 4 ++-- sys/vdpau/gstvdpvideoyuv.c | 2 +- sys/vdpau/gstvdpvideoyuv.h | 3 +-- sys/vdpau/gstvdpyuvvideo.c | 2 +- sys/vdpau/gstvdpyuvvideo.h | 3 +-- 11 files changed, 31 insertions(+), 24 deletions(-) diff --git a/sys/vdpau/Makefile.am b/sys/vdpau/Makefile.am index 9d916eb824..0da45abdc1 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 ca05b2f22b..3bc03484a3 100644 --- a/sys/vdpau/gstvdpmpegdec.c +++ b/sys/vdpau/gstvdpmpegdec.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include "mpegutil.h" diff --git a/sys/vdpau/gstvdpmpegdec.h b/sys/vdpau/gstvdpmpegdec.h index 174bf3e698..6e99e39e4c 100644 --- a/sys/vdpau/gstvdpmpegdec.h +++ b/sys/vdpau/gstvdpmpegdec.h @@ -23,9 +23,7 @@ #include #include - -#include "gstvdpdevice.h" -#include "gstvdpvideobuffer.h" +#include G_BEGIN_DECLS diff --git a/sys/vdpau/gstvdputils.c b/sys/vdpau/gstvdputils.c index 7602225f5e..7f19424fc3 100644 --- a/sys/vdpau/gstvdputils.c +++ b/sys/vdpau/gstvdputils.c @@ -18,7 +18,7 @@ * Boston, MA 02111-1307, USA. */ -#include "gstvdpvideobuffer.h" +#include #include "gstvdputils.h" diff --git a/sys/vdpau/gstvdputils.h b/sys/vdpau/gstvdputils.h index 5d9e9012db..d74287156f 100644 --- a/sys/vdpau/gstvdputils.h +++ b/sys/vdpau/gstvdputils.h @@ -22,8 +22,7 @@ #define _GST_VDP_UTILS_H_ #include - -#include "gstvdpdevice.h" +#include 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 564d872105..c942000e88 100644 --- a/sys/vdpau/gstvdpvideopostprocess.c +++ b/sys/vdpau/gstvdpvideopostprocess.c @@ -44,10 +44,9 @@ #include #include +#include #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 be9ad1b921..db9a0e3ee8 100644 --- a/sys/vdpau/gstvdpvideopostprocess.h +++ b/sys/vdpau/gstvdpvideopostprocess.h @@ -22,8 +22,8 @@ #define __GST_VDP_VIDEO_POST_PROCESS_H__ #include - -#include "gstvdpdevice.h" +#include +#include G_BEGIN_DECLS diff --git a/sys/vdpau/gstvdpvideoyuv.c b/sys/vdpau/gstvdpvideoyuv.c index 95d9e2998b..c01d559354 100644 --- a/sys/vdpau/gstvdpvideoyuv.c +++ b/sys/vdpau/gstvdpvideoyuv.c @@ -24,8 +24,8 @@ #include #include +#include -#include "gstvdpvideobuffer.h" #include "gstvdputils.h" #include "gstvdpvideoyuv.h" diff --git a/sys/vdpau/gstvdpvideoyuv.h b/sys/vdpau/gstvdpvideoyuv.h index 9e6ec12222..43f505de9d 100644 --- a/sys/vdpau/gstvdpvideoyuv.h +++ b/sys/vdpau/gstvdpvideoyuv.h @@ -23,8 +23,7 @@ #include #include - -#include "gstvdpdevice.h" +#include G_BEGIN_DECLS diff --git a/sys/vdpau/gstvdpyuvvideo.c b/sys/vdpau/gstvdpyuvvideo.c index 132b7f1526..e2e5c744fd 100644 --- a/sys/vdpau/gstvdpyuvvideo.c +++ b/sys/vdpau/gstvdpyuvvideo.c @@ -24,8 +24,8 @@ #include #include +#include -#include "gstvdpvideobuffer.h" #include "gstvdputils.h" #include "gstvdpyuvvideo.h" diff --git a/sys/vdpau/gstvdpyuvvideo.h b/sys/vdpau/gstvdpyuvvideo.h index e1fd31f79e..1580771518 100644 --- a/sys/vdpau/gstvdpyuvvideo.h +++ b/sys/vdpau/gstvdpyuvvideo.h @@ -23,8 +23,7 @@ #include #include - -#include "gstvdpdevice.h" +#include G_BEGIN_DECLS