mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-10 17:35:59 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst: structure: Stop using private structure name quark field

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7432>
This commit is contained in:
Sebastian Dröge 2024-07-05 19:40:35 +03:00
parent 2d91521dfc
commit 0823c639cc
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subprojects/gst-plugins-base/gst-libs/gst/pbutils/encoding-profile.c
View file

@ -1413,7 +1413,7 @@ gst_encoding_profile_get_input_caps (GstEncodingProfile * profile)
GstCaps *out, *tmp; GstCaps *out, *tmp;
GList *ltmp; GList *ltmp;
GstStructure *st, *outst; GstStructure *st, *outst;
GQuark out_name; const gchar *out_name;
guint i, len; guint i, len;
GstCaps *fcaps; GstCaps *fcaps;
@ -1438,13 +1438,13 @@ gst_encoding_profile_get_input_caps (GstEncodingProfile * profile)
/* Combine the format with the restriction caps */ /* Combine the format with the restriction caps */
outst = gst_caps_get_structure (fcaps, 0); outst = gst_caps_get_structure (fcaps, 0);
out_name = gst_structure_get_name_id (outst); out_name = gst_structure_get_name (outst);
tmp = gst_caps_new_empty (); tmp = gst_caps_new_empty ();
len = gst_caps_get_size (profile->restriction); len = gst_caps_get_size (profile->restriction);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
st = gst_structure_copy (gst_caps_get_structure (profile->restriction, i)); st = gst_structure_copy (gst_caps_get_structure (profile->restriction, i));
st->name = out_name; gst_structure_set_name (st, out_name);
gst_caps_append_structure (tmp, st); gst_caps_append_structure (tmp, st);
} }

2
subprojects/gstreamer/gst/gstevent.c
View file

@ -454,7 +454,7 @@ gst_event_has_name_id (GstEvent * event, GQuark name)
if (GST_EVENT_STRUCTURE (event) == NULL) if (GST_EVENT_STRUCTURE (event) == NULL)
return FALSE; return FALSE;
return (GST_EVENT_STRUCTURE (event)->name == name); return (gst_structure_get_name_id (GST_EVENT_STRUCTURE (event)) == name);
} }
/** /**

3
subprojects/gstreamer/gst/gstinfo.c
View file

@ -903,7 +903,8 @@ gst_info_structure_to_string (const GstStructure * s)
{ {
if (G_LIKELY (s)) { if (G_LIKELY (s)) {
gchar *str = gst_structure_to_string (s); gchar *str = gst_structure_to_string (s);
if (G_UNLIKELY (pretty_tags && s->name == GST_QUARK (TAGLIST))) if (G_UNLIKELY (pretty_tags
&& gst_structure_get_name_id (s) == GST_QUARK (TAGLIST)))
return prettify_structure_string (str); return prettify_structure_string (str);
else else
return str; return str;

2
subprojects/gstreamer/gst/gsttracerrecord.c
View file

@ -100,7 +100,7 @@ gst_tracer_record_build_format (GstTracerRecord * self)
{ {
GstStructure *structure = self->spec; GstStructure *structure = self->spec;
GString *s; GString *s;
gchar *name = (gchar *) g_quark_to_string (structure->name); gchar *name = (gchar *) gst_structure_get_name (structure);
gchar *p; gchar *p;
g_return_if_fail (g_str_has_suffix (name, ".class")); g_return_if_fail (g_str_has_suffix (name, ".class"));