Remove GstAggregator from -bad, moved to core

https://bugzilla.gnome.org/show_bug.cgi?id=739010

Makefile.am

@@ -120,6 +120,7 @@ CRUFT_DIRS = \
 	$(top_srcdir)/gst/shapewipe \
 	$(top_srcdir)/gst/valve \
 	$(top_srcdir)/gst-libs/gst/baseparse \
+	$(top_srcdir)/gst-libs/gst/base \
 	$(top_srcdir)/gst-libs/gst/egl \
 	$(top_srcdir)/gst-libs/gst/signalprocessor \
 	$(top_srcdir)/tests/examples/gl/gtk/gtkvideooverlay \

configure.ac

@@ -3691,7 +3691,6 @@ gst-libs/gst/codecparsers/Makefile
 gst-libs/gst/mpegts/Makefile
 gst-libs/gst/uridownloader/Makefile
 gst-libs/gst/wayland/Makefile
-gst-libs/gst/base/Makefile
 gst-libs/gst/player/Makefile
 gst-libs/gst/video/Makefile
 gst-libs/gst/audio/Makefile
@@ -3847,8 +3846,6 @@ pkgconfig/gstreamer-player.pc
 pkgconfig/gstreamer-player-uninstalled.pc
 pkgconfig/gstreamer-wayland.pc
 pkgconfig/gstreamer-wayland-uninstalled.pc
-pkgconfig/gstreamer-bad-base.pc
-pkgconfig/gstreamer-bad-base-uninstalled.pc
 pkgconfig/gstreamer-bad-video.pc
 pkgconfig/gstreamer-bad-video-uninstalled.pc
 pkgconfig/gstreamer-bad-audio.pc

docs/libs/Makefile.am

@@ -57,7 +57,6 @@ extra_files =
 # contains GtkObjects/GObjects and you want to document signals and properties.
 GTKDOC_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS)
 GTKDOC_LIBS = \
-	$(top_builddir)/gst-libs/gst/base/libgstbadbase-@GST_API_VERSION@.la \
 	$(top_builddir)/gst-libs/gst/audio/libgstbadaudio-@GST_API_VERSION@.la \
 	$(top_builddir)/gst-libs/gst/video/libgstbadvideo-@GST_API_VERSION@.la \
 	$(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_API_VERSION@.la \

docs/libs/gst-plugins-bad-libs-sections.txt

@@ -1845,45 +1845,6 @@ GstGLWindowX11Private
 x11_event_source_new
 </SECTION>
 
-<SECTION>
-<FILE>gstaggregator</FILE>
-<TITLE>GstAggregator</TITLE>
-GstAggregator
-GstAggregatorClass
-gst_aggregator_finish_buffer
-gst_aggregator_set_src_caps
-gst_aggregator_get_latency
-gst_aggregator_get_buffer_pool
-gst_aggregator_get_allocator
-<SUBSECTION Standard>
-GST_IS_AGGREGATOR
-GST_IS_AGGREGATOR_CLASS
-GST_TYPE_AGGREGATOR
-GST_AGGREGATOR
-GST_AGGREGATOR_CLASS
-GST_AGGREGATOR_GET_CLASS
-gst_aggregator_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gstaggregatorpad</FILE>
-<TITLE>GstAggregatorPad</TITLE>
-GstAggregatorPad
-GstAggregatorPadClass
-gst_aggregator_pad_steal_buffer
-gst_aggregator_pad_get_buffer
-gst_aggregator_pad_drop_buffer
-gst_aggregator_pad_is_eos
-<SUBSECTION Standard>
-GST_IS_AGGREGATOR_PAD
-GST_IS_AGGREGATOR_PAD_CLASS
-GST_TYPE_AGGREGATOR_PAD
-GST_AGGREGATOR_PAD
-GST_AGGREGATOR_PAD_CLASS
-GST_AGGREGATOR_PAD_GET_CLASS
-gst_aggregator_pad_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gstvideoaggregator</FILE>
 <TITLE>GstVideoAggregator</TITLE>

docs/libs/gst-plugins-bad-libs.types

@@ -1,6 +1,5 @@
 #include <gst/gst.h>
 
-#include <gst/base/gstaggregator.h>
 #include <gst/audio/gstaudioaggregator.h>
 #include <gst/video/gstvideoaggregator.h>
 #include <gst/codecparsers/gsth264parser.h>
@@ -10,9 +9,6 @@
 #include <gst/gl/gl.h>
 #include <gst/player/player.h>
 
-gst_aggregator_get_type
-gst_aggregator_pad_get_type
-
 gst_audio_aggregator_get_type
 gst_audio_aggregator_pad_get_type
 

ext/gl/Makefile.am

@@ -147,7 +147,6 @@ libgstopengl_la_CFLAGS = \
 
 libgstopengl_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \
-	$(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
 	$(top_builddir)/gst-libs/gst/video/libgstbadvideo-$(GST_API_VERSION).la \
 	$(GST_BASE_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \

ext/gl/meson.build

@@ -111,7 +111,7 @@ if build_gstgl and gstgl_dep.found()
     c_args : gst_plugins_bad_args + opengl_defines,
     link_args : noseh_link_args,
     include_directories : [configinc],
-    dependencies : [gstgl_dep, gstbadvideo_dep, gstbadbase_dep, gstvideo_dep,
+    dependencies : [gstgl_dep, gstbadvideo_dep, gstvideo_dep,
                     gstbase_dep, gstcontroller_dep, libm] + optional_deps,
     install : true,
     install_dir : plugins_install_dir,

ext/iqa/Makefile.am

@@ -12,7 +12,6 @@ libgstiqa_la_CFLAGS =  \
 libgstiqa_la_CFLAGS += $(DSSIM_CFLAGS)
 
 libgstiqa_la_LIBADD =  \
-	$(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
 	$(top_builddir)/gst-libs/gst/video/libgstbadvideo-$(GST_API_VERSION).la \
 	$(GST_PLUGINS_BASE_LIBS) \
 	$(GST_BASE_LIBS) $(GST_LIBS)

ext/iqa/meson.build

@@ -6,7 +6,7 @@ if dssim_dep.found()
     'iqa.c',
     c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DHAVE_DSSIM'],
     include_directories : [configinc],
-    dependencies : [gst_dep, gstbadvideo_dep, gstbadbase_dep, dssim_dep],
+    dependencies : [gst_dep, gstbadvideo_dep, gstbase_dep, dssim_dep],
     install : true,
     install_dir : plugins_install_dir,
   )

ext/openmpt/Makefile.am

@@ -9,7 +9,6 @@ libgstopenmpt_la_CFLAGS = \
 	$(GST_CFLAGS) $(OPENMPT_CFLAGS)
 libgstopenmpt_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstopenmpt_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
 	$(top_builddir)/gst-libs/gst/audio/libgstbadaudio-$(GST_API_VERSION).la \
 	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(OPENMPT_LIBS)

ext/wildmidi/Makefile.am

@@ -15,7 +15,6 @@ libgstwildmidi_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
         $(GST_CFLAGS) $(WILDMIDI_CFLAGS)
 libgstwildmidi_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
 	$(top_builddir)/gst-libs/gst/audio/libgstbadaudio-$(GST_API_VERSION).la \
 	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
         $(GST_LIBS) $(GST_BASE_LIBS) $(WILDMIDI_LIBS)

gst-libs/gst/Makefile.am

@@ -15,22 +15,21 @@ OPENCV_DIR=opencv
 endif
 
 SUBDIRS = uridownloader adaptivedemux interfaces basecamerabinsrc codecparsers \
-	 insertbin mpegts base video audio player allocators isoff $(GL_DIR) $(WAYLAND_DIR) \
+	 insertbin mpegts video audio player allocators isoff $(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 opencv base video audio player allocators isoff
+	codecparsers insertbin mpegts wayland opencv video audio player allocators isoff
 
 #dependencies
-video, audio: base
 gl: allocators
 
 adaptivedemux: uridownloader
 
 INDEPENDENT_SUBDIRS = \
 	interfaces basecamerabinsrc codecparsers insertbin uridownloader \
-	mpegts base player allocators isoff $(GL_DIR) $(WAYLAND_DIR) $(OPENCV_DIR)
+	mpegts player allocators isoff $(GL_DIR) $(WAYLAND_DIR) $(OPENCV_DIR)
 
 .PHONY: independent-subdirs $(INDEPENDENT_SUBDIRS)
 

gst-libs/gst/audio/Makefile.am

@@ -18,7 +18,6 @@ libgstbadaudio_@GST_API_VERSION@_la_CFLAGS = \
 	$(GST_BASE_CFLAGS)
 
 libgstbadaudio_@GST_API_VERSION@_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
 	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
 

gst-libs/gst/audio/meson.build

@@ -10,9 +10,9 @@ gstbadaudio = library('gstbadaudio-' + api_version,
   version : libversion,
   soversion : soversion,
   install : true,
-  dependencies : [gstbadbase_dep, gstaudio_dep],
+  dependencies : [gstaudio_dep, gstbase_dep],
 )
 
 gstbadaudio_dep = declare_dependency(link_with : gstbadaudio,
   include_directories : [libsinc],
-  dependencies : [gstbadbase_dep, gstaudio_dep])
+  dependencies : [gstaudio_dep, gstbase_dep])

gst-libs/gst/base/Makefile.am

@@ -1,16 +0,0 @@
-lib_LTLIBRARIES = libgstbadbase-@GST_API_VERSION@.la
-
-libgstbadbase_@GST_API_VERSION@_la_SOURCES = \
-	gstaggregator.c
-
-libgstbadbase_@GST_API_VERSION@_la_CFLAGS = $(GST_CFLAGS) \
-	-DGST_USE_UNSTABLE_API
-
-libgstbadbase_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS)
-libgstbadbase_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
-
-libgstbase_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/base
-libgstbase_@GST_API_VERSION@include_HEADERS = gstaggregator.h
-
-EXTRA_DIST = 
-

gst-libs/gst/base/gstaggregator.h

@@ -1,336 +0,0 @@
-/* GStreamer aggregator base class
- * Copyright (C) 2014 Mathieu Duponchelle <mathieu.duponchelle@oencreed.com>
- * Copyright (C) 2014 Thibault Saunier <tsaunier@gnome.org>
- *
- * 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_AGGREGATOR_H__
-#define __GST_AGGREGATOR_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "The Base library from gst-plugins-bad is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/**************************
- * GstAggregator Structs  *
- *************************/
-
-typedef struct _GstAggregator GstAggregator;
-typedef struct _GstAggregatorPrivate GstAggregatorPrivate;
-typedef struct _GstAggregatorClass GstAggregatorClass;
-
-/************************
- * GstAggregatorPad API *
- ***********************/
-
-#define GST_TYPE_AGGREGATOR_PAD            (gst_aggregator_pad_get_type())
-#define GST_AGGREGATOR_PAD(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AGGREGATOR_PAD, GstAggregatorPad))
-#define GST_AGGREGATOR_PAD_CAST(obj)       ((GstAggregatorPad *)(obj))
-#define GST_AGGREGATOR_PAD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AGGREGATOR_PAD, GstAggregatorPadClass))
-#define GST_AGGREGATOR_PAD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_AGGREGATOR_PAD, GstAggregatorPadClass))
-#define GST_IS_AGGREGATOR_PAD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AGGREGATOR_PAD))
-#define GST_IS_AGGREGATOR_PAD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AGGREGATOR_PAD))
-
-/****************************
- * GstAggregatorPad Structs *
- ***************************/
-
-typedef struct _GstAggregatorPad GstAggregatorPad;
-typedef struct _GstAggregatorPadClass GstAggregatorPadClass;
-typedef struct _GstAggregatorPadPrivate GstAggregatorPadPrivate;
-
-/**
- * GstAggregatorPad:
- * @segment: last segment received.
- *
- * The implementation the GstPad to use with #GstAggregator
- */
-struct _GstAggregatorPad
-{
-  GstPad                       parent;
-
-  /* Protected by the OBJECT_LOCK */
-  GstSegment segment;
-
-  /* < Private > */
-  GstAggregatorPadPrivate   *  priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstAggregatorPadClass:
- * @flush:    Optional
- *            Called when the pad has received a flush stop, this is the place
- *            to flush any information specific to the pad, it allows for individual
- *            pads to be flushed while others might not be.
- *
- */
-struct _GstAggregatorPadClass
-{
-  GstPadClass   parent_class;
-
-  GstFlowReturn (*flush)     (GstAggregatorPad * aggpad, GstAggregator * aggregator);
-
-  /*< private >*/
-  gpointer      _gst_reserved[GST_PADDING_LARGE];
-};
-
-GST_EXPORT
-GType gst_aggregator_pad_get_type           (void);
-
-/****************************
- * GstAggregatorPad methods *
- ***************************/
-
-GST_EXPORT
-GstBuffer * gst_aggregator_pad_steal_buffer (GstAggregatorPad *  pad);
-
-GST_EXPORT
-GstBuffer * gst_aggregator_pad_get_buffer   (GstAggregatorPad *  pad);
-
-GST_EXPORT
-gboolean    gst_aggregator_pad_drop_buffer  (GstAggregatorPad *  pad);
-
-GST_EXPORT
-gboolean    gst_aggregator_pad_is_eos       (GstAggregatorPad *  pad);
-
-/*********************
- * GstAggregator API *
- ********************/
-
-#define GST_TYPE_AGGREGATOR            (gst_aggregator_get_type())
-#define GST_AGGREGATOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AGGREGATOR,GstAggregator))
-#define GST_AGGREGATOR_CAST(obj)       ((GstAggregator *)(obj))
-#define GST_AGGREGATOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AGGREGATOR,GstAggregatorClass))
-#define GST_AGGREGATOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_AGGREGATOR,GstAggregatorClass))
-#define GST_IS_AGGREGATOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AGGREGATOR))
-#define GST_IS_AGGREGATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AGGREGATOR))
-
-#define GST_AGGREGATOR_FLOW_NEED_DATA             GST_FLOW_CUSTOM_ERROR
-
-/**
- * GstAggregator:
- * @srcpad: the aggregator's source pad
- * @segment: the output segment
- *
- * Aggregator base class object structure.
- */
-struct _GstAggregator
-{
-  GstElement               parent;
-
-  GstPad                *  srcpad;
-
-  /* Only access with the object lock held */
-  GstSegment               segment;
-
-  /*< private >*/
-  GstAggregatorPrivate  *  priv;
-
-  gpointer                 _gst_reserved[GST_PADDING_LARGE];
-};
-
-/**
- * GstAggregatorClass:
- * @flush:          Optional.
- *                  Called after a successful flushing seek, once all the flush
- *                  stops have been received. Flush pad-specific data in
- *                  #GstAggregatorPad->flush.
- * @clip:           Optional.
- *                  Called when a buffer is received on a sink pad, the task of
- *                  clipping it and translating it to the current segment falls
- *                  on the subclass. The function should use the segment of data
- *                  and the negotiated media type on the pad to perform
- *                  clipping of input buffer. This function takes ownership of
- *                  buf and should output a buffer or return NULL in
- *                  if the buffer should be dropped.
- * @sink_event:     Optional.
- *                  Called when an event is received on a sink pad, the subclass
- *                  should always chain up.
- * @sink_query:     Optional.
- *                  Called when a query is received on a sink pad, the subclass
- *                  should always chain up.
- * @src_event:      Optional.
- *                  Called when an event is received on the src pad, the subclass
- *                  should always chain up.
- * @src_query:      Optional.
- *                  Called when a query is received on the src pad, the subclass
- *                  should always chain up.
- * @src_activate:   Optional.
- *                  Called when the src pad is activated, it will start/stop its
- *                  pad task right after that call.
- * @aggregate:      Mandatory.
- *                  Called when buffers are queued on all sinkpads. Classes
- *                  should iterate the GstElement->sinkpads and peek or steal
- *                  buffers from the #GstAggregatorPads. If the subclass returns
- *                  GST_FLOW_EOS, sending of the eos event will be taken care
- *                  of. Once / if a buffer has been constructed from the
- *                  aggregated buffers, the subclass should call _finish_buffer.
- * @stop:           Optional.
- *                  Called when the element goes from PAUSED to READY.
- *                  The subclass should free all resources and reset its state.
- * @start:          Optional.
- *                  Called when the element goes from READY to PAUSED.
- *                  The subclass should get ready to process
- *                  aggregated buffers.
- * @get_next_time:  Optional.
- *                  Called when the element needs to know the running time of the next
- *                  rendered buffer for live pipelines. This causes deadline
- *                  based aggregation to occur. Defaults to returning
- *                  GST_CLOCK_TIME_NONE causing the element to wait for buffers
- *                  on all sink pads before aggregating.
- * @update_src_caps: Lets subclasses update the #GstCaps representing
- *                   the src pad caps before usage.  The result should end up
- *                   in @ret. Return %GST_AGGREGATOR_FLOW_NEED_DATA to indicate that the
- *                   element needs more information (caps, a buffer, etc) to
- *                   choose the correct caps. Should return ANY caps if the
- *                   stream has not caps at all.
- * @fixate_src_caps: Optional.
- *                   Fixate and return the src pad caps provided.  The function takes
- *                   ownership of @caps and returns a fixated version of
- *                   @caps. @caps is not guaranteed to be writable.
- * @negotiated_src_caps: Optional.
- *                       Notifies subclasses what caps format has been negotiated
- * @decide_allocation: Optional.
- *                     Allows the subclass to influence the allocation choices.
- *                     Setup the allocation parameters for allocating output
- *                     buffers. The passed in query contains the result of the
- *                     downstream allocation query.
- *
- * The aggregator base class will handle in a thread-safe way all manners of
- * concurrent flushes, seeks, pad additions and removals, leaving to the
- * subclass the responsibility of clipping buffers, and aggregating buffers in
- * the way the implementor sees fit.
- *
- * It will also take care of event ordering (stream-start, segment, eos).
- *
- * Basically, a simple implementation will override @aggregate, and call
- * _finish_buffer from inside that function.
- */
-struct _GstAggregatorClass {
-  GstElementClass   parent_class;
-
-  GstFlowReturn     (*flush)          (GstAggregator    *  aggregator);
-
-  GstBuffer *       (*clip)           (GstAggregator    *  aggregator,
-                                       GstAggregatorPad *  aggregator_pad,
-                                       GstBuffer        *  buf);
-
-  /* sinkpads virtual methods */
-  gboolean          (*sink_event)     (GstAggregator    *  aggregator,
-                                       GstAggregatorPad *  aggregator_pad,
-                                       GstEvent         *  event);
-
-  gboolean          (*sink_query)     (GstAggregator    *  aggregator,
-                                       GstAggregatorPad *  aggregator_pad,
-                                       GstQuery         *  query);
-
-  /* srcpad virtual methods */
-  gboolean          (*src_event)      (GstAggregator    *  aggregator,
-                                       GstEvent         *  event);
-
-  gboolean          (*src_query)      (GstAggregator    *  aggregator,
-                                       GstQuery         *  query);
-
-  gboolean          (*src_activate)   (GstAggregator    *  aggregator,
-                                       GstPadMode          mode,
-                                       gboolean            active);
-
-  GstFlowReturn     (*aggregate)      (GstAggregator    *  aggregator,
-                                       gboolean            timeout);
-
-  gboolean          (*stop)           (GstAggregator    *  aggregator);
-
-  gboolean          (*start)          (GstAggregator    *  aggregator);
-
-  GstClockTime      (*get_next_time)  (GstAggregator    *  aggregator);
-
-  GstAggregatorPad * (*create_new_pad) (GstAggregator  * self,
-                                        GstPadTemplate * templ,
-                                        const gchar    * req_name,
-                                        const GstCaps  * caps);
-  GstFlowReturn     (*update_src_caps) (GstAggregator *  self,
-                                        GstCaps       *  caps,
-                                        GstCaps       ** ret);
-  GstCaps *         (*fixate_src_caps) (GstAggregator *  self,
-                                        GstCaps       *  caps);
-  gboolean          (*negotiated_src_caps) (GstAggregator *  self,
-                                            GstCaps      *  caps);
-  gboolean          (*decide_allocation) (GstAggregator * self,
-                                          GstQuery * query);
-  gboolean          (*propose_allocation) (GstAggregator * self,
-                                           GstAggregatorPad * pad,
-                                           GstQuery * decide_query,
-                                           GstQuery * query);
-  /*< private >*/
-  gpointer          _gst_reserved[GST_PADDING_LARGE];
-};
-
-/************************************
- * GstAggregator convenience macros *
- ***********************************/
-
-/**
- * GST_AGGREGATOR_SRC_PAD:
- * @agg: a #GstAggregator
- *
- * Convenience macro to access the source pad of #GstAggregator
- *
- * Since: 1.6
- */
-#define GST_AGGREGATOR_SRC_PAD(agg) (((GstAggregator *)(agg))->srcpad)
-
-/*************************
- * GstAggregator methods *
- ************************/
-
-GST_EXPORT
-GstFlowReturn  gst_aggregator_finish_buffer         (GstAggregator                *  self,
-                                                     GstBuffer                    *  buffer);
-
-GST_EXPORT
-void           gst_aggregator_set_src_caps          (GstAggregator                *  self,
-                                                     GstCaps                      *  caps);
-
-GST_EXPORT
-void           gst_aggregator_set_latency           (GstAggregator                *  self,
-                                                     GstClockTime                    min_latency,
-                                                     GstClockTime                    max_latency);
-
-GST_EXPORT
-GType gst_aggregator_get_type(void);
-
-GST_EXPORT
-GstClockTime  gst_aggregator_get_latency           (GstAggregator                 *  self);
-
-GST_EXPORT
-GstBufferPool * gst_aggregator_get_buffer_pool     (GstAggregator                 * self);
-
-GST_EXPORT
-void            gst_aggregator_get_allocator       (GstAggregator                 * self,
-                                                    GstAllocator                 ** allocator,
-                                                    GstAllocationParams           * params);
-
-G_END_DECLS
-
-#endif /* __GST_AGGREGATOR_H__ */

gst-libs/gst/base/meson.build

@@ -1,17 +0,0 @@
-badbase_sources = ['gstaggregator.c']
-badbase_headers = ['gstaggregator.h']
-install_headers(badbase_headers, subdir : 'gstreamer-1.0/gst/base')
-
-gstbadbase = library('gstbadbase-' + api_version,
-  badbase_sources,
-  c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'],
-  include_directories : [configinc, libsinc],
-  version : libversion,
-  soversion : soversion,
-  install : true,
-  dependencies : [gst_dep],
-)
-
-gstbadbase_dep = declare_dependency(link_with : gstbadbase,
-  include_directories : [libsinc],
-  dependencies : [gst_dep])

gst-libs/gst/meson.build

@@ -1,4 +1,3 @@
-subdir('base')
 subdir('uridownloader')
 
 subdir('allocators')

gst-libs/gst/video/Makefile.am

@@ -17,7 +17,6 @@ libgstbadvideo_@GST_API_VERSION@_la_CFLAGS = \
 	$(GST_BASE_CFLAGS)
 
 libgstbadvideo_@GST_API_VERSION@_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
 	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
 

gst-libs/gst/video/meson.build

@@ -15,9 +15,9 @@ gstbadvideo = library('gstbadvideo-' + api_version,
   version : libversion,
   soversion : soversion,
   install : true,
-  dependencies : [gstvideo_dep, gstbadbase_dep],
+  dependencies : [gstvideo_dep, gstbase_dep],
 )
 
 gstbadvideo_dep = declare_dependency(link_with : gstbadvideo,
   include_directories : [libsinc],
-  dependencies : [gstvideo_dep, gstbadbase_dep])
+  dependencies : [gstvideo_dep, gstbase_dep])

gst/audiomixer/Makefile.am

@@ -13,7 +13,6 @@ libgstaudiomixer_la_CFLAGS = \
 	$(GST_CFLAGS) $(ORC_CFLAGS)
 libgstaudiomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaudiomixer_la_LIBADD =  \
-		$(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
 		$(top_builddir)/gst-libs/gst/audio/libgstbadaudio-$(GST_API_VERSION).la \
 		$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 		$(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS)

gst/audiomixer/meson.build

@@ -26,8 +26,7 @@ gstaudiomixer = library('gstaudiomixer',
   audiomixer_sources, orc_c, orc_h,
   c_args : gst_plugins_bad_args + [ '-DGST_USE_UNSTABLE_API' ],
   include_directories : [configinc],
-  dependencies : [gstbadaudio_dep, gstbadbase_dep, gstaudio_dep, gstbase_dep,
+  dependencies : [gstbadaudio_dep, gstaudio_dep, gstbase_dep, orc_dep],
-		  orc_dep],
   install : true,
   install_dir : plugins_install_dir,
 )

gst/compositor/Makefile.am

@@ -16,7 +16,6 @@ libgstcompositor_la_CFLAGS =  \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
 libgstcompositor_la_LIBADD =  \
-	$(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
 	$(top_builddir)/gst-libs/gst/video/libgstbadvideo-$(GST_API_VERSION).la \
 	$(GST_PLUGINS_BASE_LIBS) \
 	-lgstvideo-@GST_API_VERSION@ \

gst/compositor/meson.build

@@ -26,8 +26,7 @@ gstcompositor = library('gstcompositor',
   compositor_sources, orc_c, orc_h,
   c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'],
   include_directories : [configinc],
-  dependencies : [gstbadvideo_dep, gstbadbase_dep, gstvideo_dep, gstbase_dep,
+  dependencies : [gstbadvideo_dep, gstvideo_dep, gstbase_dep, orc_dep, libm],
-		  orc_dep, libm],
   install : true,
   install_dir : plugins_install_dir,
 )

gst/mxf/Makefile.am

@@ -25,7 +25,6 @@ libgstmxf_la_CFLAGS = \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS)
 libgstmxf_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
 	$(GST_PLUGINS_BASE_LIBS) \
 	-lgstvideo-@GST_API_VERSION@ \
 	-lgstaudio-@GST_API_VERSION@ \

gst/mxf/meson.build

@@ -22,7 +22,7 @@ gstmxf = library('gstmxf',
   mxf_sources,
   c_args : gst_plugins_bad_args + [ '-DGST_USE_UNSTABLE_API' ],
   include_directories : [configinc],
-  dependencies : [gstbadbase_dep, gstbase_dep, gstaudio_dep, gstvideo_dep],
+  dependencies : [gstbase_dep, gstaudio_dep, gstvideo_dep],
   install : true,
   install_dir : plugins_install_dir,
 )

pkgconfig/Makefile.am

@@ -6,7 +6,6 @@ pcverfiles =  \
 	gstreamer-insertbin-@GST_API_VERSION@.pc \
 	gstreamer-mpegts-@GST_API_VERSION@.pc \
 	gstreamer-player-@GST_API_VERSION@.pc \
-	gstreamer-bad-base-@GST_API_VERSION@.pc \
 	gstreamer-bad-audio-@GST_API_VERSION@.pc \
 	gstreamer-bad-video-@GST_API_VERSION@.pc \
 	gstreamer-bad-allocators-@GST_API_VERSION@.pc
@@ -17,7 +16,6 @@ pcverfiles_uninstalled = \
 	gstreamer-insertbin-@GST_API_VERSION@-uninstalled.pc \
 	gstreamer-mpegts-@GST_API_VERSION@-uninstalled.pc \
 	gstreamer-player-@GST_API_VERSION@-uninstalled.pc \
-	gstreamer-bad-base-@GST_API_VERSION@-uninstalled.pc \
 	gstreamer-bad-audio-@GST_API_VERSION@-uninstalled.pc \
 	gstreamer-bad-video-@GST_API_VERSION@-uninstalled.pc \
 	gstreamer-bad-allocators-@GST_API_VERSION@-uninstalled.pc
@@ -41,7 +39,6 @@ cp_verbose_0 = @echo "  CP     $@";
 ### rather than hardcoding it in the file directly.
 	$(AM_V_GEN) sed \
 		-e "s|[@]audiolibdir[@]|$(abs_top_builddir)/gst-libs/gst/audio/.libs|" \
-		-e "s|[@]baselibdir[@]|$(abs_top_builddir)/gst-libs/gst/base/.libs|" \
 		-e "s|[@]videolibdir[@]|$(abs_top_builddir)/gst-libs/gst/video/.libs|" \
 		-e "s|[@]codecparserslibdir[@]|$(abs_top_builddir)/gst-libs/gst/codecparsers/.libs|" \
 		-e "s|[@]gllibdir[@]|$(abs_top_builddir)/gst-libs/gst/gl/.libs|" \
@@ -66,7 +63,6 @@ pcinfiles = \
            gstreamer-player.pc.in gstreamer-player-uninstalled.pc.in \
            gstreamer-bad-audio.pc.in gstreamer-bad-audio-uninstalled.pc.in \
            gstreamer-bad-video.pc.in gstreamer-bad-video-uninstalled.pc.in \
-           gstreamer-bad-base.pc.in gstreamer-bad-base-uninstalled.pc.in \
            gstreamer-bad-allocators.pc.in gstreamer-bad-allocators-uninstalled.pc.in
 
 DISTCLEANFILES = $(pcinfiles:.in=)

pkgconfig/gstreamer-bad-base-uninstalled.pc.in

@@ -1,14 +0,0 @@
-prefix=
-exec_prefix=
-libdir=@baselibdir@
-includedir=@abs_top_builddir@/gst-libs
-girdir=@abs_top_builddir@/gst-libs/gst/base
-typelibdir=@abs_top_builddir@/gst-libs/gst/base
-
-Name: GStreamer bad base classes, uninstalled
-Description: Bad base classes for GStreamer elements, Not Installed
-Version: @VERSION@
-Requires: gstreamer-@GST_API_VERSION@
-
-Libs: -L${libdir} -lgstbadbase-@GST_API_VERSION@
-Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs

pkgconfig/gstreamer-bad-base.pc.in

@@ -1,16 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_API_VERSION@
-datarootdir=${prefix}/share
-datadir=${datarootdir}
-girdir=${datadir}/gir-1.0
-typelibdir=${libdir}/girepository-1.0
-
-Name: GStreamer bad base classes
-Description: Bad base classes for GStreamer elements
-Version: @VERSION@
-Requires: gstreamer-@GST_API_VERSION@
-
-Libs: -L${libdir} -lgstbadbase-@GST_API_VERSION@
-Cflags: -I${includedir}

pkgconfig/meson.build

@@ -11,7 +11,6 @@ pkgconf.set('VERSION', gst_version)
 pkgconf.set('abs_top_builddir', join_paths(meson.current_build_dir(), '..'))
 pkgconf.set('abs_top_srcdir', join_paths(meson.current_source_dir(), '..'))
 pkgconf.set('audiolibdir', join_paths(meson.build_root(), gstbadaudio.outdir()))
-pkgconf.set('baselibdir', join_paths(meson.build_root(), gstbadbase.outdir()))
 pkgconf.set('videolibdir', join_paths(meson.build_root(), gstbadvideo.outdir()))
 pkgconf.set('codecparserslibdir', join_paths(meson.build_root(), gstcodecparsers.outdir()))
 pkgconf.set('insertbinlibdir', join_paths(meson.build_root(), gstinsertbin.outdir()))
@@ -24,7 +23,6 @@ pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
 
 pkg_libs = [
   'bad-audio',
-  'bad-base',
   'bad-video',
   'codecparsers',
   'insertbin',

tests/check/Makefile.am

@@ -289,7 +289,6 @@ check_PROGRAMS = \
 	libs/mpegts \
 	libs/h264parser \
 	libs/vp8parser \
-	libs/aggregator \
 	$(check_uvch264) \
 	libs/vc1parser \
 	$(check_schro) \
@@ -668,16 +667,6 @@ pipelines_simple_launch_lines_CFLAGS = \
 pipelines_simple_launch_lines_LDADD = \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(LDADD)
 
-libs_aggregator_LDADD = \
-	$(top_builddir)/gst-libs/gst/base/libgstbadbase-@GST_API_VERSION@.la \
-	$(GST_PLUGINS_BASE_LIBS) \
-	$(GST_BASE_LIBS) $(GST_LIBS) $(LDADD)
-
-libs_aggregator_CFLAGS = \
-	$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
-	-DGST_USE_UNSTABLE_API \
-	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
-
 elements_compositor_LDADD = \
 	$(GST_PLUGINS_BASE_LIBS) $(GST_VIDEO_LIBS) $(GST_BASE_LIBS) $(LDADD)
 elements_compositor_CFLAGS = \