videoaggregator: Get rid of separate header for the aggregator pad

diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 7d728ee..c8d2eb6 100644 (file)
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -23,4 +23,4 @@ libgstbadvideo_@GST_API_VERSION@_la_LIBADD = \
 libgstbadvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
 libgstvideo_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/video
-libgstvideo_@GST_API_VERSION@include_HEADERS = gstvideoaggregatorpad.h gstvideoaggregator.h video-bad-prelude.h
+libgstvideo_@GST_API_VERSION@include_HEADERS = gstvideoaggregator.h video-bad-prelude.h

diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c
index 5a9dfc9..93fa0cc 100644 (file)
--- a/gst-libs/gst/video/gstvideoaggregator.c
+++ b/gst-libs/gst/video/gstvideoaggregator.c
@@ -42,7 +42,6 @@
 #include <string.h>
 
 #include "gstvideoaggregator.h"
-#include "gstvideoaggregatorpad.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_video_aggregator_debug);
 #define GST_CAT_DEFAULT gst_video_aggregator_debug

diff --git a/gst-libs/gst/video/gstvideoaggregator.h b/gst-libs/gst/video/gstvideoaggregator.h
index d3e5370..633028a 100644 (file)
--- a/gst-libs/gst/video/gstvideoaggregator.h
+++ b/gst-libs/gst/video/gstvideoaggregator.h
@@ -33,6 +33,89 @@
 
 G_BEGIN_DECLS
 
+typedef struct _GstVideoAggregator GstVideoAggregator;
+typedef struct _GstVideoAggregatorClass GstVideoAggregatorClass;
+typedef struct _GstVideoAggregatorPrivate GstVideoAggregatorPrivate;
+
+#define GST_TYPE_VIDEO_AGGREGATOR_PAD (gst_video_aggregator_pad_get_type())
+#define GST_VIDEO_AGGREGATOR_PAD(obj) \
+        (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_AGGREGATOR_PAD, GstVideoAggregatorPad))
+#define GST_VIDEO_AGGREGATOR_PAD_CAST(obj) ((GstVideoAggregatorPad *)(obj))
+#define GST_VIDEO_AGGREGATOR_PAD_CLASS(klass) \
+        (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_COMPOSITOR_PAD, GstVideoAggregatorPadClass))
+#define GST_IS_VIDEO_AGGREGATOR_PAD(obj) \
+        (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_AGGREGATOR_PAD))
+#define GST_IS_VIDEO_AGGREGATOR_PAD_CLASS(klass) \
+        (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_AGGREGATOR_PAD))
+#define GST_VIDEO_AGGREGATOR_PAD_GET_CLASS(obj) \
+        (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_VIDEO_AGGREGATOR_PAD,GstVideoAggregatorPadClass))
+
+typedef struct _GstVideoAggregatorPad GstVideoAggregatorPad;
+typedef struct _GstVideoAggregatorPadClass GstVideoAggregatorPadClass;
+typedef struct _GstVideoAggregatorPadPrivate GstVideoAggregatorPadPrivate;
+
+/**
+ * GstVideoAggregatorPad:
+ * @info: The #GstVideoInfo currently set on the pad
+ * @buffer_vinfo: The #GstVideoInfo representing the type contained
+ *                in @buffer
+ * @aggregated_frame: The #GstVideoFrame ready to be used for aggregation
+ *                    inside the aggregate_frames vmethod.
+ * @zorder: The zorder of this pad
+ */
+struct _GstVideoAggregatorPad
+{
+  GstAggregatorPad parent;
+
+  GstVideoInfo info;
+
+  GstBuffer *buffer;
+
+  GstVideoFrame *aggregated_frame;
+
+  /* properties */
+  guint zorder;
+  gboolean ignore_eos;
+
+  /* Subclasses can force an alpha channel in the (input thus output)
+   * colorspace format */
+  gboolean needs_alpha;
+
+  /* < private > */
+  GstVideoAggregatorPadPrivate *priv;
+
+  gpointer          _gst_reserved[GST_PADDING];
+};
+
+/**
+ * GstVideoAggregatorPadClass:
+ *
+ * @set_info: Lets subclass set a converter on the pad,
+ *                 right after a new format has been negotiated.
+ * @prepare_frame: Prepare the frame from the pad buffer (if any)
+ *                 and sets it to @aggregated_frame
+ * @clean_frame:   clean the frame previously prepared in prepare_frame
+ */
+struct _GstVideoAggregatorPadClass
+{
+  GstAggregatorPadClass parent_class;
+  gboolean           (*set_info)              (GstVideoAggregatorPad * pad,
+                                               GstVideoAggregator    * videoaggregator,
+                                               GstVideoInfo          * current_info,
+                                               GstVideoInfo          * wanted_info);
+
+  gboolean           (*prepare_frame)         (GstVideoAggregatorPad * pad,
+                                               GstVideoAggregator    * videoaggregator);
+
+  void               (*clean_frame)           (GstVideoAggregatorPad * pad,
+                                               GstVideoAggregator    * videoaggregator);
+
+  gpointer          _gst_reserved[GST_PADDING_LARGE];
+};
+
+GST_VIDEO_BAD_API
+GType gst_video_aggregator_pad_get_type   (void);
+
 #define GST_TYPE_VIDEO_AGGREGATOR (gst_video_aggregator_get_type())
 #define GST_VIDEO_AGGREGATOR(obj) \
         (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_AGGREGATOR, GstVideoAggregator))
@@ -46,12 +129,6 @@ G_BEGIN_DECLS
 #define GST_VIDEO_AGGREGATOR_GET_CLASS(obj) \
         (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_VIDEO_AGGREGATOR,GstVideoAggregatorClass))
 
-typedef struct _GstVideoAggregator GstVideoAggregator;
-typedef struct _GstVideoAggregatorClass GstVideoAggregatorClass;
-typedef struct _GstVideoAggregatorPrivate GstVideoAggregatorPrivate;
-
-#include "gstvideoaggregatorpad.h"
-
 /**
  * GstVideoAggregator:
  * @info: The #GstVideoInfo representing the currently set

diff --git a/gst-libs/gst/video/gstvideoaggregatorpad.h b/gst-libs/gst/video/gstvideoaggregatorpad.h
deleted file mode 100644 (file)
index 79cb8e5..0000000
--- a/gst-libs/gst/video/gstvideoaggregatorpad.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Generic video aggregator plugin
- * Copyright (C) 2008 Wim Taymans <wim@fluendo.com>
- * Copyright (C) 2010 Sebastian Dröge <sebastian.droege@collabora.co.uk>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GST_VIDEO_AGGREGATOR_PAD_H__
-#define __GST_VIDEO_AGGREGATOR_PAD_H__
-
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
-#include <gst/base/gstaggregator.h>
-#include "gstvideoaggregator.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_AGGREGATOR_PAD (gst_video_aggregator_pad_get_type())
-#define GST_VIDEO_AGGREGATOR_PAD(obj) \
-        (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_AGGREGATOR_PAD, GstVideoAggregatorPad))
-#define GST_VIDEO_AGGREGATOR_PAD_CAST(obj) ((GstVideoAggregatorPad *)(obj))
-#define GST_VIDEO_AGGREGATOR_PAD_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_COMPOSITOR_PAD, GstVideoAggregatorPadClass))
-#define GST_IS_VIDEO_AGGREGATOR_PAD(obj) \
-        (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_AGGREGATOR_PAD))
-#define GST_IS_VIDEO_AGGREGATOR_PAD_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_AGGREGATOR_PAD))
-#define GST_VIDEO_AGGREGATOR_PAD_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_VIDEO_AGGREGATOR_PAD,GstVideoAggregatorPadClass))
-
-typedef struct _GstVideoAggregatorPad GstVideoAggregatorPad;
-typedef struct _GstVideoAggregatorPadClass GstVideoAggregatorPadClass;
-typedef struct _GstVideoAggregatorPadPrivate GstVideoAggregatorPadPrivate;
-
-/**
- * GstVideoAggregatorPad:
- * @info: The #GstVideoInfo currently set on the pad
- * @buffer_vinfo: The #GstVideoInfo representing the type contained
- *                in @buffer
- * @aggregated_frame: The #GstVideoFrame ready to be used for aggregation
- *                    inside the aggregate_frames vmethod.
- * @zorder: The zorder of this pad
- */
-struct _GstVideoAggregatorPad
-{
-  GstAggregatorPad parent;
-
-  GstVideoInfo info;
-
-  GstBuffer *buffer;
-
-  GstVideoFrame *aggregated_frame;
-
-  /* properties */
-  guint zorder;
-  gboolean ignore_eos;
-
-  /* Subclasses can force an alpha channel in the (input thus output)
-   * colorspace format */
-  gboolean needs_alpha;
-
-  /* < private > */
-  GstVideoAggregatorPadPrivate *priv;
-
-  gpointer          _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstVideoAggregatorPadClass:
- *
- * @set_info: Lets subclass set a converter on the pad,
- *                 right after a new format has been negotiated.
- * @prepare_frame: Prepare the frame from the pad buffer (if any)
- *                 and sets it to @aggregated_frame
- * @clean_frame:   clean the frame previously prepared in prepare_frame
- */
-struct _GstVideoAggregatorPadClass
-{
-  GstAggregatorPadClass parent_class;
-  gboolean           (*set_info)              (GstVideoAggregatorPad * pad,
-                                               GstVideoAggregator    * videoaggregator,
-                                               GstVideoInfo          * current_info,
-                                               GstVideoInfo          * wanted_info);
-
-  gboolean           (*prepare_frame)         (GstVideoAggregatorPad * pad,
-                                               GstVideoAggregator    * videoaggregator);
-
-  void               (*clean_frame)           (GstVideoAggregatorPad * pad,
-                                               GstVideoAggregator    * videoaggregator);
-
-  gpointer          _gst_reserved[GST_PADDING_LARGE];
-};
-
-GST_VIDEO_BAD_API
-GType gst_video_aggregator_pad_get_type (void);
-
-G_END_DECLS
-#endif /* __GST_VIDEO_AGGREGATOR_PAD_H__ */

diff --git a/gst-libs/gst/video/meson.build b/gst-libs/gst/video/meson.build
index d071b8d..39f48f2 100644 (file)
--- a/gst-libs/gst/video/meson.build
+++ b/gst-libs/gst/video/meson.build
@@ -2,7 +2,6 @@ badvideo_sources = [
   'gstvideoaggregator.c',
 ]
 badvideo_headers = [
-  'gstvideoaggregatorpad.h',
   'gstvideoaggregator.h',
   'video-bad-prelude.h',
 ]