autoconvert: Factor out a new GstBaseAutoConvert class

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>

subprojects/gst-plugins-bad/gst/autoconvert/gstautoconvert.h

@@ -1,8 +1,7 @@
 /* GStreamer
  *
- *  Copyright 2007 Collabora Ltd
+ *  Copyright 2023 Igalia S.L.
- *   @author: Olivier Crete <olivier.crete@collabora.co.uk>
+ *   @author: Thibault Saunier <tsaunier@igalia.com>
- *  Copyright 2007-2008 Nokia
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,54 +19,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
+ #pragma once
 
-#ifndef __GST_AUTO_CONVERT_H__
+ #include "gstbaseautoconvert.h"
-#define __GST_AUTO_CONVERT_H__
 
-#include <gst/gst.h>
+ G_DECLARE_FINAL_TYPE(GstAutoConvert, gst_auto_convert, GST, AUTO_CONVERT, GstBaseAutoConvert);
-#include <gst/gstbin.h>
-
-G_BEGIN_DECLS
-#define GST_TYPE_AUTO_CONVERT 	        	(gst_auto_convert_get_type())
-#define GST_AUTO_CONVERT(obj)	                (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AUTO_CONVERT,GstAutoConvert))
-#define GST_AUTO_CONVERT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AUTO_CONVERT,GstAutoConvertClass))
-#define GST_AUTO_CONVERT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_AUTO_CONCERT, GstAutoConvertClass))
-#define GST_IS_AUTO_CONVERT(obj)              (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AUTO_CONVERT))
-#define GST_IS_AUTO_CONVERT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AUTO_CONVERT))
-typedef struct _GstAutoConvert GstAutoConvert;
-typedef struct _GstAutoConvertClass GstAutoConvertClass;
-
-struct _GstAutoConvert
-{
-  /*< private >*/
-  GstBin bin;                   /* we extend GstBin */
-
-  GList *factories;
-
-  GstPad *sinkpad;
-  GstPad *srcpad;
-
-  /* Have to be set all at once
-   * Protected by the object lock and the stream lock
-   * Both must be held to modify these
-   */
-  GstElement *current_subelement;
-  GstPad *current_internal_srcpad;
-  GstPad *current_internal_sinkpad;
-
-  GHashTable * elements;
-};
-
-struct _GstAutoConvertClass
-{
-  GstBinClass parent_class;
-
-  GList* (*load_factories)(GstAutoConvert *autoconvert);
-};
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstAutoConvert, gst_object_unref)
-GType gst_auto_convert_get_type (void);
 GST_ELEMENT_REGISTER_DECLARE (autoconvert);
-
-G_END_DECLS
-#endif /* __GST_AUTO_CONVERT_H__ */

subprojects/gst-plugins-bad/gst/autoconvert/gstbaseautoconvert.h

@@ -0,0 +1,70 @@
+/* GStreamer
+ *
+ *  Copyright 2007 Collabora Ltd
+ *   @author: Olivier Crete <olivier.crete@collabora.co.uk>
+ *  Copyright 2007-2008 Nokia
+ *  Copyright 2023 Igalia S.L.
+ *   @author: Thibault Saunier <tsaunier@igalia.com>
+ *
+ * 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.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+#define GST_TYPE_BASE_AUTO_CONVERT         (gst_base_auto_convert_get_type())
+#define GST_BASE_AUTO_CONVERT(obj)                (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_BASE_AUTO_CONVERT,GstBaseAutoConvert))
+#define GST_BASE_AUTO_CONVERT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_BASE_AUTO_CONVERT,GstBaseAutoConvertClass))
+#define GST_BASE_AUTO_CONVERT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASE_AUTO_CONCERT, GstBaseAutoConvertClass))
+#define GST_IS_BASE_AUTO_CONVERT(obj)              (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_BASE_AUTO_CONVERT))
+#define GST_IS_BASE_AUTO_CONVERT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_BASE_AUTO_CONVERT))
+typedef struct _GstBaseAutoConvert GstBaseAutoConvert;
+typedef struct _GstBaseAutoConvertClass GstBaseAutoConvertClass;
+
+struct _GstBaseAutoConvert
+{
+  /*< private >*/
+  GstBin bin;                   /* we extend GstBin */
+
+  GList *factories;
+
+  GstPad *sinkpad;
+  GstPad *srcpad;
+
+  /* Have to be set all at once
+   * Protected by the object lock and the stream lock
+   * Both must be held to modify these
+   */
+  GstElement *current_subelement;
+  GstPad *current_internal_srcpad;
+  GstPad *current_internal_sinkpad;
+
+  GHashTable * elements;
+};
+
+struct _GstBaseAutoConvertClass
+{
+  GstBinClass parent_class;
+
+  GList* (*load_factories)(GstBaseAutoConvert *base_autoconvert);
+};
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstBaseAutoConvert, gst_object_unref)
+GType gst_base_auto_convert_get_type (void);
+
+G_END_DECLS

subprojects/gst-plugins-bad/gst/autoconvert/meson.build

@@ -1,4 +1,5 @@
 autocon_sources = [
+  'gstbaseautoconvert.c',
   'gstautoconvert.c',
   'gstautovideoconvert.c',
   'plugin.c',