From 086b25d40a8fc3606d70c32af7f6af178e2d804d Mon Sep 17 00:00:00 2001 From: Christian Schaller Date: Fri, 6 May 2005 11:41:28 +0000 Subject: remove gst-libs from gst-plugins module as it is in gst-plugins-base now Original commit message from CVS: remove gst-libs from gst-plugins module as it is in gst-plugins-base now --- gst-libs/gst/video/Makefile.am | 12 --- gst-libs/gst/video/gstvideosink.c | 91 ------------------ gst-libs/gst/video/video.c | 103 -------------------- gst-libs/gst/video/video.h | 194 -------------------------------------- gst-libs/gst/video/video.vcproj | 150 ----------------------------- gst-libs/gst/video/videosink.h | 71 -------------- 6 files changed, 621 deletions(-) delete mode 100644 gst-libs/gst/video/Makefile.am delete mode 100644 gst-libs/gst/video/gstvideosink.c delete mode 100644 gst-libs/gst/video/video.c delete mode 100644 gst-libs/gst/video/video.h delete mode 100644 gst-libs/gst/video/video.vcproj delete mode 100644 gst-libs/gst/video/videosink.h (limited to 'gst-libs/gst/video') diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am deleted file mode 100644 index 7a163773..00000000 --- a/gst-libs/gst/video/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@ - -library_LTLIBRARIES = libgstvideo.la - -libgstvideo_la_SOURCES = video.c gstvideosink.c - -libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video -libgstvideoinclude_HEADERS = video.h videosink.h - -libgstvideo_la_LIBADD = -libgstvideo_la_CFLAGS = $(GST_CFLAGS) -libgstvideo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/video/gstvideosink.c b/gst-libs/gst/video/gstvideosink.c deleted file mode 100644 index 1085ace9..00000000 --- a/gst-libs/gst/video/gstvideosink.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - * GStreamer Video sink. - * - * Copyright (C) <2003> Julien Moutte - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "videosink.h" - -static GstElementClass *parent_class = NULL; - -/* Private methods */ - -static void -gst_videosink_set_clock (GstElement * element, GstClock * clock) -{ - GstVideoSink *videosink; - - videosink = GST_VIDEOSINK (element); - - videosink->clock = clock; -} - -/* Initing stuff */ - -static void -gst_videosink_init (GstVideoSink * videosink) -{ - videosink->width = 0; - videosink->height = 0; - videosink->clock = NULL; -} - -static void -gst_videosink_class_init (GstVideoSinkClass * klass) -{ - GObjectClass *gobject_class; - GstElementClass *gstelement_class; - - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; - - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); - - gstelement_class->set_clock = gst_videosink_set_clock; -} - -/* Public methods */ - -GType -gst_videosink_get_type (void) -{ - static GType videosink_type = 0; - - if (!videosink_type) { - static const GTypeInfo videosink_info = { - sizeof (GstVideoSinkClass), - NULL, - NULL, - (GClassInitFunc) gst_videosink_class_init, - NULL, - NULL, - sizeof (GstVideoSink), - 0, - (GInstanceInitFunc) gst_videosink_init, - }; - - videosink_type = g_type_register_static (GST_TYPE_ELEMENT, - "GstVideoSink", &videosink_info, 0); - } - - return videosink_type; -} diff --git a/gst-libs/gst/video/video.c b/gst-libs/gst/video/video.c deleted file mode 100644 index 6e942112..00000000 --- a/gst-libs/gst/video/video.c +++ /dev/null @@ -1,103 +0,0 @@ -/* GStreamer - * Copyright (C) <1999> Erik Walthinsen - * Library <2002> Ronald Bultje - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include "video.h" - -/* This is simply a convenience function, nothing more or less */ - -gdouble -gst_video_frame_rate (GstPad * pad) -{ - gdouble fps = 0.; - const GstCaps *caps = NULL; - GstStructure *structure; - - /* get pad caps */ - caps = GST_PAD_CAPS (pad); - if (caps == NULL) { - g_warning ("gstvideo: failed to get caps of pad %s:%s", - GST_ELEMENT_NAME (gst_pad_get_parent (pad)), GST_PAD_NAME (pad)); - return 0.; - } - - structure = gst_caps_get_structure (caps, 0); - if (!gst_structure_get_double (structure, "framerate", &fps)) { - g_warning ("gstvideo: failed to get framerate property of pad %s:%s", - GST_ELEMENT_NAME (gst_pad_get_parent (pad)), GST_PAD_NAME (pad)); - return 0.; - } - - GST_DEBUG ("Framerate request on pad %s:%s: %f", - GST_ELEMENT_NAME (gst_pad_get_parent (pad)), GST_PAD_NAME (pad), fps); - - return fps; -} - -gboolean -gst_video_get_size (GstPad * pad, gint * width, gint * height) -{ - const GstCaps *caps = NULL; - GstStructure *structure; - gboolean ret; - - g_return_val_if_fail (pad != NULL, FALSE); - g_return_val_if_fail (width != NULL, FALSE); - g_return_val_if_fail (height != NULL, FALSE); - - caps = GST_PAD_CAPS (pad); - - if (caps == NULL) { - g_warning ("gstvideo: failed to get caps of pad %s:%s", - GST_ELEMENT_NAME (gst_pad_get_parent (pad)), GST_PAD_NAME (pad)); - return FALSE; - } - - structure = gst_caps_get_structure (caps, 0); - ret = gst_structure_get_int (structure, "width", width); - ret &= gst_structure_get_int (structure, "height", height); - - if (!ret) { - g_warning ("gstvideo: failed to get size properties on pad %s:%s", - GST_ELEMENT_NAME (gst_pad_get_parent (pad)), GST_PAD_NAME (pad)); - return FALSE; - } - - GST_DEBUG ("size request on pad %s:%s: %dx%d", - GST_ELEMENT_NAME (gst_pad_get_parent (pad)), - GST_PAD_NAME (pad), width ? *width : -1, height ? *height : -1); - - return TRUE; -} - -static gboolean -plugin_init (GstPlugin * plugin) -{ - return TRUE; -} - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "gstvideo", - "Convenience routines for video plugins", - plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN) diff --git a/gst-libs/gst/video/video.h b/gst-libs/gst/video/video.h deleted file mode 100644 index 97a2aacd..00000000 --- a/gst-libs/gst/video/video.h +++ /dev/null @@ -1,194 +0,0 @@ -/* GStreamer - * Copyright (C) <1999> Erik Walthinsen - * Library <2002> Ronald Bultje - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __GST_VIDEO_H__ -#define __GST_VIDEO_H__ - -#include - -G_BEGIN_DECLS - -#define GST_VIDEO_BYTE1_MASK_32 "0xFF000000" -#define GST_VIDEO_BYTE2_MASK_32 "0x00FF0000" -#define GST_VIDEO_BYTE3_MASK_32 "0x0000FF00" -#define GST_VIDEO_BYTE4_MASK_32 "0x000000FF" - -#define GST_VIDEO_BYTE1_MASK_24 "0x00FF0000" -#define GST_VIDEO_BYTE2_MASK_24 "0x0000FF00" -#define GST_VIDEO_BYTE3_MASK_24 "0x000000FF" - -#define GST_VIDEO_BYTE1_MASK_32_INT 0xFF000000 -#define GST_VIDEO_BYTE2_MASK_32_INT 0x00FF0000 -#define GST_VIDEO_BYTE3_MASK_32_INT 0x0000FF00 -#define GST_VIDEO_BYTE4_MASK_32_INT 0x000000FF - -#define GST_VIDEO_BYTE1_MASK_24_INT 0x00FF0000 -#define GST_VIDEO_BYTE2_MASK_24_INT 0x0000FF00 -#define GST_VIDEO_BYTE3_MASK_24_INT 0x000000FF - -#define GST_VIDEO_RED_MASK_16 "0xf800" -#define GST_VIDEO_GREEN_MASK_16 "0x07e0" -#define GST_VIDEO_BLUE_MASK_16 "0x001f" - -#define GST_VIDEO_RED_MASK_15 "0x7c00" -#define GST_VIDEO_GREEN_MASK_15 "0x03e0" -#define GST_VIDEO_BLUE_MASK_15 "0x001f" - -#define GST_VIDEO_RED_MASK_16_INT 0xf800 -#define GST_VIDEO_GREEN_MASK_16_INT 0x07e0 -#define GST_VIDEO_BLUE_MASK_16_INT 0x001f - -#define GST_VIDEO_RED_MASK_15_INT 0x7c00 -#define GST_VIDEO_GREEN_MASK_15_INT 0x03e0 -#define GST_VIDEO_BLUE_MASK_15_INT 0x001f - -#define GST_VIDEO_SIZE_RANGE "(int) [ 16, 4096 ]" -#define GST_VIDEO_FPS_RANGE "(double) [ 0, max ]" - -/* consider the next 2 protected */ -#define __GST_VIDEO_CAPS_MAKE_32A(R, G, B, A) \ - "video/x-raw-rgb, " \ - "bpp = (int) 32, " \ - "depth = (int) 32, " \ - "endianness = (int) BIG_ENDIAN, " \ - "red_mask = (int) " GST_VIDEO_BYTE ## R ## _MASK_32 ", " \ - "green_mask = (int) " GST_VIDEO_BYTE ## G ## _MASK_32 ", " \ - "blue_mask = (int) " GST_VIDEO_BYTE ## B ## _MASK_32 ", " \ - "alpha_mask = (int) " GST_VIDEO_BYTE ## A ## _MASK_32 ", " \ - "width = " GST_VIDEO_SIZE_RANGE ", " \ - "height = " GST_VIDEO_SIZE_RANGE ", " \ - "framerate = " GST_VIDEO_FPS_RANGE - -#define __GST_VIDEO_CAPS_MAKE_32(R, G, B) \ - "video/x-raw-rgb, " \ - "bpp = (int) 32, " \ - "depth = (int) 24, " \ - "endianness = (int) BIG_ENDIAN, " \ - "red_mask = (int) " GST_VIDEO_BYTE ## R ## _MASK_32 ", " \ - "green_mask = (int) " GST_VIDEO_BYTE ## G ## _MASK_32 ", " \ - "blue_mask = (int) " GST_VIDEO_BYTE ## B ## _MASK_32 ", " \ - "width = " GST_VIDEO_SIZE_RANGE ", " \ - "height = " GST_VIDEO_SIZE_RANGE ", " \ - "framerate = " GST_VIDEO_FPS_RANGE - -#define __GST_VIDEO_CAPS_MAKE_24(R, G, B) \ - "video/x-raw-rgb, " \ - "bpp = (int) 24, " \ - "depth = (int) 24, " \ - "endianness = (int) BIG_ENDIAN, " \ - "red_mask = (int) " GST_VIDEO_BYTE ## R ## _MASK_24 ", " \ - "green_mask = (int) " GST_VIDEO_BYTE ## G ## _MASK_24 ", " \ - "blue_mask = (int) " GST_VIDEO_BYTE ## B ## _MASK_24 ", " \ - "width = " GST_VIDEO_SIZE_RANGE ", " \ - "height = " GST_VIDEO_SIZE_RANGE ", " \ - "framerate = " GST_VIDEO_FPS_RANGE - - -/* 24 bit */ - -#define GST_VIDEO_CAPS_RGB \ - __GST_VIDEO_CAPS_MAKE_24 (1, 2, 3) - -#define GST_VIDEO_CAPS_BGR \ - __GST_VIDEO_CAPS_MAKE_24 (3, 2, 1) - -/* 32 bit */ - -#define GST_VIDEO_CAPS_RGBx \ - __GST_VIDEO_CAPS_MAKE_32 (1, 2, 3) - -#define GST_VIDEO_CAPS_xRGB \ - __GST_VIDEO_CAPS_MAKE_32 (2, 3, 4) - -#define GST_VIDEO_CAPS_BGRx \ - __GST_VIDEO_CAPS_MAKE_32 (3, 2, 1) - -#define GST_VIDEO_CAPS_xBGR \ - __GST_VIDEO_CAPS_MAKE_32 (4, 3, 2) - -/* 32 bit alpha */ - -#define GST_VIDEO_CAPS_RGBA \ - __GST_VIDEO_CAPS_MAKE_32A (1, 2, 3, 4) - -#define GST_VIDEO_CAPS_ARGB \ - __GST_VIDEO_CAPS_MAKE_32A (2, 3, 4, 1) - -#define GST_VIDEO_CAPS_BGRA \ - __GST_VIDEO_CAPS_MAKE_32A (3, 2, 1, 4) - -#define GST_VIDEO_CAPS_ABGR \ - __GST_VIDEO_CAPS_MAKE_32A (4, 3, 2, 1) - -/* note: the macro name uses the order on BE systems */ -#if G_BYTE_ORDER == G_BIG_ENDIAN - #define GST_VIDEO_CAPS_xRGB_HOST_ENDIAN \ - GST_VIDEO_CAPS_xRGB - #define GST_VIDEO_CAPS_BGRx_HOST_ENDIAN \ - GST_VIDEO_CAPS_BGRx -#else - #define GST_VIDEO_CAPS_xRGB_HOST_ENDIAN \ - GST_VIDEO_CAPS_BGRx - #define GST_VIDEO_CAPS_BGRx_HOST_ENDIAN \ - GST_VIDEO_CAPS_xRGB -#endif - -/* 15/16 bit */ - -#define GST_VIDEO_CAPS_RGB_16 \ - "video/x-raw-rgb, " \ - "bpp = (int) 16, " \ - "depth = (int) 16, " \ - "endianness = (int) BYTE_ORDER, " \ - "red_mask = (int) " GST_VIDEO_RED_MASK_16 ", " \ - "green_mask = (int) " GST_VIDEO_GREEN_MASK_16 ", " \ - "blue_mask = (int) " GST_VIDEO_BLUE_MASK_16 ", " \ - "width = " GST_VIDEO_SIZE_RANGE ", " \ - "height = " GST_VIDEO_SIZE_RANGE ", " \ - "framerate = " GST_VIDEO_FPS_RANGE - -#define GST_VIDEO_CAPS_RGB_15 \ - "video/x-raw-rgb, " \ - "bpp = (int) 16, " \ - "depth = (int) 15, " \ - "endianness = (int) BYTE_ORDER, " \ - "red_mask = (int) " GST_VIDEO_RED_MASK_15 ", " \ - "green_mask = (int) " GST_VIDEO_GREEN_MASK_15 ", " \ - "blue_mask = (int) " GST_VIDEO_BLUE_MASK_15 ", " \ - "width = " GST_VIDEO_SIZE_RANGE ", " \ - "height = " GST_VIDEO_SIZE_RANGE ", " \ - "framerate = " GST_VIDEO_FPS_RANGE - -#define GST_VIDEO_CAPS_YUV(fourcc) \ - "video/x-raw-yuv, " \ - "format = (fourcc) " fourcc ", " \ - "width = " GST_VIDEO_SIZE_RANGE ", " \ - "height = " GST_VIDEO_SIZE_RANGE ", " \ - "framerate = " GST_VIDEO_FPS_RANGE - -/* functions */ -gdouble gst_video_frame_rate (GstPad *pad); -gboolean gst_video_get_size (GstPad *pad, - gint *width, - gint *height); - -G_END_DECLS - -#endif /* __GST_VIDEO_H__ */ diff --git a/gst-libs/gst/video/video.vcproj b/gst-libs/gst/video/video.vcproj deleted file mode 100644 index 24402944..00000000 --- a/gst-libs/gst/video/video.vcproj +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gst-libs/gst/video/videosink.h b/gst-libs/gst/video/videosink.h deleted file mode 100644 index bdf52e15..00000000 --- a/gst-libs/gst/video/videosink.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * GStreamer Video sink. - * - * Copyright (C) <2003> Julien Moutte - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __GST_VIDEOSINK_H__ -#define __GST_VIDEOSINK_H__ - -#include - -G_BEGIN_DECLS - -#define GST_TYPE_VIDEOSINK (gst_videosink_get_type()) -#define GST_VIDEOSINK(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEOSINK, GstVideoSink)) -#define GST_VIDEOSINK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_VIDEOSINK, GstVideoSink)) -#define GST_IS_VIDEOSINK(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEOSINK)) -#define GST_IS_VIDEOSINK_CLASS(obj) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_VIDEOSINK)) -#define GST_VIDEOSINK_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VIDEOSINK, GstVideoSinkClass)) - -#define GST_VIDEOSINK_PAD(obj) (GST_VIDEOSINK (obj)->sinkpad) -#define GST_VIDEOSINK_WIDTH(obj) (GST_VIDEOSINK (obj)->width) -#define GST_VIDEOSINK_HEIGHT(obj) (GST_VIDEOSINK (obj)->height) -#define GST_VIDEOSINK_CLOCK(obj) (GST_VIDEOSINK (obj)->clock) - -typedef struct _GstVideoSink GstVideoSink; -typedef struct _GstVideoSinkClass GstVideoSinkClass; - -struct _GstVideoSink { - GstElement element; - - GstPad *sinkpad; - - gint width, height; - - GstClock *clock; - - gpointer _gst_reserved[GST_PADDING]; -}; - -struct _GstVideoSinkClass { - GstElementClass parent_class; - - gpointer _gst_reserved[GST_PADDING]; -}; - -GType gst_videosink_get_type (void); - -G_END_DECLS - -#endif /* __GST_VIDEOSINK_H__ */ -- cgit v1.2.1