xingmux: move from gst-plugins-ugly to gst-plugins-good

Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/415

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

diff --git a/subprojects/gst-plugins-good/docs/gst_plugins_cache.json b/subprojects/gst-plugins-good/docs/gst_plugins_cache.json
index e45e8a7..9649c78 100644 (file)
--- a/subprojects/gst-plugins-good/docs/gst_plugins_cache.json
+++ b/subprojects/gst-plugins-good/docs/gst_plugins_cache.json
@@ -28060,6 +28060,44 @@
         "tracers": {},
         "url": "Unknown package origin"
     },
+    "xingmux": {
+        "description": "Add XING tags to mpeg audio files",
+        "elements": {
+            "xingmux": {
+                "author": "Christophe Fergeau <teuf@gnome.org>",
+                "description": "Adds a Xing header to the beginning of a VBR MP3 file",
+                "hierarchy": [
+                    "GstXingMux",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ],
+                "klass": "Formatter/Muxer/Metadata",
+                "long-name": "MP3 Xing muxer",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "audio/mpeg:\n    mpegversion: 1\n          layer: [ 1, 3 ]\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "audio/mpeg:\n    mpegversion: 1\n          layer: [ 1, 3 ]\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "rank": "marginal"
+            }
+        },
+        "filename": "gstxingmux",
+        "license": "LGPL",
+        "other-types": {},
+        "package": "GStreamer Good Plug-ins",
+        "source": "gst-plugins-good",
+        "tracers": {},
+        "url": "Unknown package origin"
+    },
     "y4menc": {
         "description": "Encodes a YUV frame into the yuv4mpeg format (mjpegtools)",
         "elements": {

diff --git a/subprojects/gst-plugins-good/gst/meson.build b/subprojects/gst-plugins-good/gst/meson.build
index cbc28ca..4dfe3b7 100644 (file)
--- a/subprojects/gst-plugins-good/gst/meson.build
+++ b/subprojects/gst-plugins-good/gst/meson.build
@@ -6,7 +6,7 @@ foreach plugin : ['alpha', 'apetag', 'audiofx', 'audioparsers', 'auparse',
                   'monoscope', 'multifile', 'multipart', 'replaygain', 'rtp',
                   'rtpmanager', 'rtsp', 'shapewipe', 'smpte', 'spectrum',
                   'udp', 'videobox', 'videocrop', 'videofilter', 'videomixer',
-                  'wavenc', 'wavparse', 'y4m']
+                  'wavenc', 'wavparse', 'xingmux', 'y4m']
   if not get_option(plugin).disabled()
     subdir(plugin)
   endif

diff --git a/subprojects/gst-plugins-ugly/gst/xingmux/gstxingmux.c b/subprojects/gst-plugins-good/gst/xingmux/gstxingmux.c
similarity index 100%
rename from subprojects/gst-plugins-ugly/gst/xingmux/gstxingmux.c
rename to subprojects/gst-plugins-good/gst/xingmux/gstxingmux.c

diff --git a/subprojects/gst-plugins-ugly/gst/xingmux/gstxingmux.h b/subprojects/gst-plugins-good/gst/xingmux/gstxingmux.h
similarity index 100%
rename from subprojects/gst-plugins-ugly/gst/xingmux/gstxingmux.h
rename to subprojects/gst-plugins-good/gst/xingmux/gstxingmux.h

diff --git a/subprojects/gst-plugins-ugly/gst/xingmux/meson.build b/subprojects/gst-plugins-good/gst/xingmux/meson.build
similarity index 88%
rename from subprojects/gst-plugins-ugly/gst/xingmux/meson.build
rename to subprojects/gst-plugins-good/gst/xingmux/meson.build
index bd9c8eb..ff8e9d7 100644 (file)
--- a/subprojects/gst-plugins-ugly/gst/xingmux/meson.build
+++ b/subprojects/gst-plugins-good/gst/xingmux/meson.build
@@ -5,7 +5,7 @@ xing_sources = [
 
 gstxingmux = library('gstxingmux',
   xing_sources,
-  c_args : ugly_args,
+  c_args : gst_plugins_good_args,
   include_directories : [configinc],
   dependencies : [gstbase_dep],
   install : true,

diff --git a/subprojects/gst-plugins-ugly/gst/xingmux/plugin.c b/subprojects/gst-plugins-good/gst/xingmux/plugin.c
similarity index 100%
rename from subprojects/gst-plugins-ugly/gst/xingmux/plugin.c
rename to subprojects/gst-plugins-good/gst/xingmux/plugin.c

diff --git a/subprojects/gst-plugins-good/meson_options.txt b/subprojects/gst-plugins-good/meson_options.txt
index b3581bd..4c2d199 100644 (file)
--- a/subprojects/gst-plugins-good/meson_options.txt
+++ b/subprojects/gst-plugins-good/meson_options.txt
@@ -41,6 +41,7 @@ option('videofilter', type : 'feature', value : 'auto')
 option('videomixer', type : 'feature', value : 'auto')
 option('wavenc', type : 'feature', value : 'auto')
 option('wavparse', type : 'feature', value : 'auto')
+option('xingmux', type : 'feature', value : 'auto')
 option('y4m', type : 'feature', value : 'auto')
 
 # Feature options for plugins with external deps

diff --git a/subprojects/gst-plugins-ugly/tests/check/elements/xingmux.c b/subprojects/gst-plugins-good/tests/check/elements/xingmux.c
similarity index 98%
rename from subprojects/gst-plugins-ugly/tests/check/elements/xingmux.c
rename to subprojects/gst-plugins-good/tests/check/elements/xingmux.c
index b1fa510..da5d4c6 100644 (file)
--- a/subprojects/gst-plugins-ugly/tests/check/elements/xingmux.c
+++ b/subprojects/gst-plugins-good/tests/check/elements/xingmux.c
@@ -44,8 +44,8 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_STATIC_CAPS ("audio/mpeg, " "mpegversion = (int) 1," "layer = (int) 3")
     );
 
-GstElement *
-setup_xingmux ()
+static GstElement *
+setup_xingmux (void)
 {
   GstElement *xingmux;
   GstCaps *caps;
@@ -65,7 +65,7 @@ setup_xingmux ()
   return xingmux;
 }
 
-void
+static void
 cleanup_xingmux (GstElement * xingmux)
 {
   GST_DEBUG ("cleanup_xingmux");
@@ -139,7 +139,7 @@ GST_START_TEST (test_xing_remux)
 
 GST_END_TEST;
 
-Suite *
+static Suite *
 xingmux_suite (void)
 {
   Suite *s = suite_create ("xingmux");

diff --git a/subprojects/gst-plugins-ugly/tests/check/elements/xingmux_testdata.h b/subprojects/gst-plugins-good/tests/check/elements/xingmux_testdata.h
similarity index 100%
rename from subprojects/gst-plugins-ugly/tests/check/elements/xingmux_testdata.h
rename to subprojects/gst-plugins-good/tests/check/elements/xingmux_testdata.h

diff --git a/subprojects/gst-plugins-good/tests/check/meson.build b/subprojects/gst-plugins-good/tests/check/meson.build
index 8a8c9d8..0626837 100644 (file)
--- a/subprojects/gst-plugins-good/tests/check/meson.build
+++ b/subprojects/gst-plugins-good/tests/check/meson.build
@@ -75,6 +75,7 @@ good_tests = [
   [ 'pipelines/wavenc', get_option('wavenc').disabled()],
   [ 'elements/wavparse', get_option('wavparse').disabled(), [gstriff_dep] ],
   [ 'elements/wavpackparse', get_option('audioparsers').disabled()],
+  [ 'elements/xingmux', get_option('xingmux').disabled()],
   [ 'elements/y4menc', get_option('y4m').disabled()],
   [ 'pipelines/effectv', get_option('effectv').disabled()],
   [ 'elements/equalizer', get_option('equalizer').disabled()],

diff --git a/subprojects/gst-plugins-ugly/docs/gst_plugins_cache.json b/subprojects/gst-plugins-ugly/docs/gst_plugins_cache.json
index 1de6d70..02b9c23 100644 (file)
--- a/subprojects/gst-plugins-ugly/docs/gst_plugins_cache.json
+++ b/subprojects/gst-plugins-ugly/docs/gst_plugins_cache.json
@@ -1973,43 +1973,5 @@
         "source": "gst-plugins-ugly",
         "tracers": {},
         "url": "Unknown package origin"
-    },
-    "xingmux": {
-        "description": "Add XING tags to mpeg audio files",
-        "elements": {
-            "xingmux": {
-                "author": "Christophe Fergeau <teuf@gnome.org>",
-                "description": "Adds a Xing header to the beginning of a VBR MP3 file",
-                "hierarchy": [
-                    "GstXingMux",
-                    "GstElement",
-                    "GstObject",
-                    "GInitiallyUnowned",
-                    "GObject"
-                ],
-                "klass": "Formatter/Muxer/Metadata",
-                "long-name": "MP3 Xing muxer",
-                "pad-templates": {
-                    "sink": {
-                        "caps": "audio/mpeg:\n    mpegversion: 1\n          layer: [ 1, 3 ]\n",
-                        "direction": "sink",
-                        "presence": "always"
-                    },
-                    "src": {
-                        "caps": "audio/mpeg:\n    mpegversion: 1\n          layer: [ 1, 3 ]\n",
-                        "direction": "src",
-                        "presence": "always"
-                    }
-                },
-                "rank": "marginal"
-            }
-        },
-        "filename": "gstxingmux",
-        "license": "LGPL",
-        "other-types": {},
-        "package": "GStreamer Ugly Plug-ins",
-        "source": "gst-plugins-ugly",
-        "tracers": {},
-        "url": "Unknown package origin"
     }
 }
\ No newline at end of file

diff --git a/subprojects/gst-plugins-ugly/gst/meson.build b/subprojects/gst-plugins-ugly/gst/meson.build
index 19e7d2a..b04cc7b 100644 (file)
--- a/subprojects/gst-plugins-ugly/gst/meson.build
+++ b/subprojects/gst-plugins-ugly/gst/meson.build
@@ -1,4 +1,4 @@
-foreach plugin : ['asfdemux', 'dvdlpcmdec', 'dvdsub', 'realmedia', 'xingmux']
+foreach plugin : ['asfdemux', 'dvdlpcmdec', 'dvdsub', 'realmedia']
   if not get_option(plugin).disabled()
     subdir(plugin)
   endif

diff --git a/subprojects/gst-plugins-ugly/meson_options.txt b/subprojects/gst-plugins-ugly/meson_options.txt
index 6bdcaf2..1a54888 100644 (file)
--- a/subprojects/gst-plugins-ugly/meson_options.txt
+++ b/subprojects/gst-plugins-ugly/meson_options.txt
@@ -6,7 +6,6 @@ option('asfdemux', type : 'feature', value : 'auto')
 option('dvdlpcmdec', type : 'feature', value : 'auto')
 option('dvdsub', type : 'feature', value : 'auto')
 option('realmedia', type : 'feature', value : 'auto')
-option('xingmux', type : 'feature', value : 'auto')
 
 # Feature options for plugins that need external deps
 option('a52dec', type : 'feature', value : 'auto', description : 'Dolby Digital (AC-3) audio decoder plugin based on liba52 (GPL - only built if gpl option is also enabled!)')

diff --git a/subprojects/gst-plugins-ugly/tests/check/meson.build b/subprojects/gst-plugins-ugly/tests/check/meson.build
index 256dbe8..41f6039 100644 (file)
--- a/subprojects/gst-plugins-ugly/tests/check/meson.build
+++ b/subprojects/gst-plugins-ugly/tests/check/meson.build
@@ -1,7 +1,6 @@
 # name, condition when to skip the test and extra dependencies
 ugly_tests = [
   [ 'elements/x264enc', not x264_dep.found(), [ x264_dep, gmodule_dep ] ],
-  [ 'elements/xingmux', get_option('xingmux').disabled()],
   [ 'generic/states' ],
 ]