diff options
| author | Philippe Normand <philn@igalia.com> | 2018-10-12 15:34:45 +0100 |
|---|---|---|
| committer | Philippe Normand <philn@igalia.com> | 2018-10-12 17:20:02 +0100 |
| commit | a2832689adce1e12a30ddba9abefdfa88c692e65 (patch) | |
| tree | 9e7c47ae1b14e3068f2a44889fa4bc771c64eb5a | |
| parent | ca4b61c55562a4b74f241fe54cf1e5639a2aea25 (diff) | |
| download | gstreamer-a2832689adce1e12a30ddba9abefdfa88c692e65.tar.gz | |
gstelementfactory: Remove MEDIA_HARDWARE FactoryType
Using the MEDIA_ classifier prefix was inappropriate. It is sufficient to
specify the additional klass name that element can set in their metadata.
(follow-up of commit ca4b61c55562a4b74f241fe54cf1e5639a2aea25)
https://bugzilla.gnome.org/show_bug.cgi?id=796921
| -rw-r--r-- | docs/gst/gstreamer-sections.txt | 2 | ||||
| -rw-r--r-- | gst/gstelementfactory.h | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 6c130a6e66..cfcd7832ea 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -1051,7 +1051,6 @@ GST_ELEMENT_FACTORY_TYPE_MEDIA_IMAGE GST_ELEMENT_FACTORY_TYPE_MEDIA_METADATA GST_ELEMENT_FACTORY_TYPE_MEDIA_SUBTITLE GST_ELEMENT_FACTORY_TYPE_MEDIA_VIDEO -GST_ELEMENT_FACTORY_TYPE_MEDIA_HARDWARE GST_ELEMENT_FACTORY_TYPE_MEDIA_ANY GST_ELEMENT_FACTORY_TYPE_MUXER GST_ELEMENT_FACTORY_TYPE_PARSER @@ -1079,6 +1078,7 @@ GST_ELEMENT_FACTORY_KLASS_DEPAYLOADER GST_ELEMENT_FACTORY_KLASS_ENCODER GST_ELEMENT_FACTORY_KLASS_ENCRYPTOR GST_ELEMENT_FACTORY_KLASS_FORMATTER +GST_ELEMENT_FACTORY_KLASS_HARDWARE GST_ELEMENT_FACTORY_KLASS_MEDIA_AUDIO GST_ELEMENT_FACTORY_KLASS_MEDIA_IMAGE GST_ELEMENT_FACTORY_KLASS_MEDIA_METADATA diff --git a/gst/gstelementfactory.h b/gst/gstelementfactory.h index 505d9757b1..bab9f20ab0 100644 --- a/gst/gstelementfactory.h +++ b/gst/gstelementfactory.h @@ -111,7 +111,6 @@ gboolean gst_element_register (GstPlugin *plug * @GST_ELEMENT_FACTORY_TYPE_MEDIA_IMAGE: Elements handling image media types * @GST_ELEMENT_FACTORY_TYPE_MEDIA_SUBTITLE: Elements handling subtitle media types * @GST_ELEMENT_FACTORY_TYPE_MEDIA_METADATA: Elements handling metadata media types - * @GST_ELEMENT_FACTORY_TYPE_MEDIA_HARDWARE: Elements interacting with hardware devices, you may need to put the element in "READY" state to test if the hardware is present in the system (Since 1.16) * * The type of #GstElementFactory to filter. * @@ -143,7 +142,7 @@ typedef guint64 GstElementFactoryListType; #define GST_ELEMENT_FACTORY_TYPE_MEDIA_IMAGE ((GstElementFactoryListType)(G_GUINT64_CONSTANT (1) << 51)) #define GST_ELEMENT_FACTORY_TYPE_MEDIA_SUBTITLE ((GstElementFactoryListType)(G_GUINT64_CONSTANT (1) << 52)) #define GST_ELEMENT_FACTORY_TYPE_MEDIA_METADATA ((GstElementFactoryListType)(G_GUINT64_CONSTANT (1) << 53)) -#define GST_ELEMENT_FACTORY_TYPE_MEDIA_HARDWARE ((GstElementFactoryListType)(G_GUINT64_CONSTANT (1) << 54)) + /** * GST_ELEMENT_FACTORY_TYPE_ANY: (value 562949953421311) (type GstElementFactoryListType) * @@ -210,7 +209,17 @@ typedef guint64 GstElementFactoryListType; #define GST_ELEMENT_FACTORY_KLASS_MEDIA_IMAGE "Image" #define GST_ELEMENT_FACTORY_KLASS_MEDIA_SUBTITLE "Subtitle" #define GST_ELEMENT_FACTORY_KLASS_MEDIA_METADATA "Metadata" -#define GST_ELEMENT_FACTORY_KLASS_MEDIA_HARDWARE "Hardware" + +/** + * GST_ELEMENT_FACTORY_KLASS_HARDWARE: + * + * Elements interacting with hardware devices should specify this classifier in + * their metadata. You may need to put the element in "READY" state to test if + * the hardware is present in the system. + * + * Since: 1.16 + */ +#define GST_ELEMENT_FACTORY_KLASS_HARDWARE "Hardware" GST_API gboolean gst_element_factory_list_is_type (GstElementFactory *factory, |