diff options
| author | Stéphane Cerveau <scerveau@collabora.com> | 2021-03-29 10:38:07 +0200 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-03-29 19:13:36 +0000 |
| commit | d6055ac6d4e52e13c4f924d422bacff5fbd380e7 (patch) | |
| tree | 5229adac64493db7414aaa37fab465c8938592e1 | |
| parent | a423f23fc70f48e4a6041b3c11ccabf8673feb6d (diff) | |
| download | gstreamer-plugins-ugly-d6055ac6d4e52e13c4f924d422bacff5fbd380e7.tar.gz | |
amrnb: allow per feature registration
Split plugin into features including
dynamic types which can be indiviually
registered during a static build.
More details here:
https://gitlab.freedesktop.org/gstreamer/gst-build/-/merge_requests/199
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/661
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly/-/merge_requests/79>
| -rw-r--r-- | ext/amrnb/amrnb.c | 10 | ||||
| -rw-r--r-- | ext/amrnb/amrnbdec.c | 2 | ||||
| -rw-r--r-- | ext/amrnb/amrnbdec.h | 1 | ||||
| -rw-r--r-- | ext/amrnb/amrnbenc.c | 2 | ||||
| -rw-r--r-- | ext/amrnb/amrnbenc.h | 1 |
5 files changed, 12 insertions, 4 deletions
diff --git a/ext/amrnb/amrnb.c b/ext/amrnb/amrnb.c index aa9c6957..3fe3a00f 100644 --- a/ext/amrnb/amrnb.c +++ b/ext/amrnb/amrnb.c @@ -27,10 +27,12 @@ static gboolean plugin_init (GstPlugin * plugin) { - return gst_element_register (plugin, "amrnbdec", - GST_RANK_PRIMARY, GST_TYPE_AMRNBDEC) && - gst_element_register (plugin, "amrnbenc", - GST_RANK_SECONDARY, GST_TYPE_AMRNBENC); + gboolean ret = FALSE; + + ret |= GST_ELEMENT_REGISTER (amrnbdec, plugin); + ret |= GST_ELEMENT_REGISTER (amrnbenc, plugin); + + return ret; } diff --git a/ext/amrnb/amrnbdec.c b/ext/amrnb/amrnbdec.c index fd31b9e6..e984fb85 100644 --- a/ext/amrnb/amrnbdec.c +++ b/ext/amrnb/amrnbdec.c @@ -103,6 +103,8 @@ static GstFlowReturn gst_amrnbdec_handle_frame (GstAudioDecoder * dec, #define gst_amrnbdec_parent_class parent_class G_DEFINE_TYPE (GstAmrnbDec, gst_amrnbdec, GST_TYPE_AUDIO_DECODER); +GST_ELEMENT_REGISTER_DEFINE (amrnbdec, "amrnbdec", GST_RANK_PRIMARY, + GST_TYPE_AMRNBDEC); static void gst_amrnbdec_class_init (GstAmrnbDecClass * klass) diff --git a/ext/amrnb/amrnbdec.h b/ext/amrnb/amrnbdec.h index f8407a2c..25b3db29 100644 --- a/ext/amrnb/amrnbdec.h +++ b/ext/amrnb/amrnbdec.h @@ -64,6 +64,7 @@ struct _GstAmrnbDecClass { }; GType gst_amrnbdec_get_type (void); +GST_ELEMENT_REGISTER_DECLARE (amrnbdec); G_END_DECLS diff --git a/ext/amrnb/amrnbenc.c b/ext/amrnb/amrnbenc.c index c93546f4..8417326f 100644 --- a/ext/amrnb/amrnbenc.c +++ b/ext/amrnb/amrnbenc.c @@ -98,6 +98,8 @@ static GstFlowReturn gst_amrnbenc_handle_frame (GstAudioEncoder * enc, #define gst_amrnbenc_parent_class parent_class G_DEFINE_TYPE (GstAmrnbEnc, gst_amrnbenc, GST_TYPE_AUDIO_ENCODER); +GST_ELEMENT_REGISTER_DEFINE (amrnbenc, "amrnbenc", GST_RANK_SECONDARY, + GST_TYPE_AMRNBENC); static void gst_amrnbenc_set_property (GObject * object, guint prop_id, diff --git a/ext/amrnb/amrnbenc.h b/ext/amrnb/amrnbenc.h index 9546a44b..83262e47 100644 --- a/ext/amrnb/amrnbenc.h +++ b/ext/amrnb/amrnbenc.h @@ -60,6 +60,7 @@ struct _GstAmrnbEncClass { }; GType gst_amrnbenc_get_type (void); +GST_ELEMENT_REGISTER_DECLARE (amrnbenc); G_END_DECLS |