mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 20:51:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

discoverer: use GST_TYPE_TAG_LIST for tag lists

Browse source 
They may not be structures in 0.11/1.0.
This commit is contained in:
Tim-Philipp Müller 2012-01-10 18:27:19 +00:00
parent 5f20af6ce5
commit b155e094ed
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gst-libs/gst/pbutils/gstdiscoverer.c
View file

@ -602,7 +602,7 @@ collect_stream_information (GstDiscoverer * dc, PrivateStream * ps, guint idx)
gst_caps_unref (caps); gst_caps_unref (caps);
} }
if (ps->tags) if (ps->tags)
gst_structure_id_set (st, _TAGS_QUARK, GST_TYPE_STRUCTURE, ps->tags, NULL); gst_structure_id_set (st, _TAGS_QUARK, GST_TYPE_TAG_LIST, ps->tags, NULL);
return st; return st;
} }
@ -632,7 +632,8 @@ collect_information (GstDiscoverer * dc, const GstStructure * st,
GstDiscovererStreamInfo * parent) GstDiscovererStreamInfo * parent)
{ {
GstCaps *caps; GstCaps *caps;
GstStructure *caps_st, *tags_st; GstStructure *caps_st;
GstTagList *tags_st;
const gchar *name; const gchar *name;
int tmp, tmp2; int tmp, tmp2;
guint utmp; guint utmp;
@ -671,8 +672,7 @@ collect_information (GstDiscoverer * dc, const GstStructure * st,
info->depth = (guint) tmp; info->depth = (guint) tmp;
if (gst_structure_id_has_field (st, _TAGS_QUARK)) { if (gst_structure_id_has_field (st, _TAGS_QUARK)) {
gst_structure_id_get (st, _TAGS_QUARK, gst_structure_id_get (st, _TAGS_QUARK, GST_TYPE_TAG_LIST, &tags_st, NULL);
GST_TYPE_STRUCTURE, &tags_st, NULL);
if (gst_structure_get_uint (tags_st, GST_TAG_BITRATE, &utmp) || if (gst_structure_get_uint (tags_st, GST_TAG_BITRATE, &utmp) ||
gst_structure_get_uint (tags_st, GST_TAG_NOMINAL_BITRATE, &utmp)) gst_structure_get_uint (tags_st, GST_TAG_NOMINAL_BITRATE, &utmp))
info->bitrate = utmp; info->bitrate = utmp;
@ -681,8 +681,7 @@ collect_information (GstDiscoverer * dc, const GstStructure * st,
info->max_bitrate = utmp; info->max_bitrate = utmp;
/* FIXME: Is it worth it to remove the tags we've parsed? */ /* FIXME: Is it worth it to remove the tags we've parsed? */
gst_discoverer_merge_and_replace_tags (&info->parent.tags, gst_discoverer_merge_and_replace_tags (&info->parent.tags, tags_st);
(GstTagList *) tags_st);
} }
if (!info->language && ((GstDiscovererStreamInfo *) info)->tags) { if (!info->language && ((GstDiscovererStreamInfo *) info)->tags) {
@ -733,8 +732,7 @@ collect_information (GstDiscoverer * dc, const GstStructure * st,
info->interlaced = FALSE; info->interlaced = FALSE;
if (gst_structure_id_has_field (st, _TAGS_QUARK)) { if (gst_structure_id_has_field (st, _TAGS_QUARK)) {
gst_structure_id_get (st, _TAGS_QUARK, gst_structure_id_get (st, _TAGS_QUARK, GST_TYPE_TAG_LIST, &tags_st, NULL);
GST_TYPE_STRUCTURE, &tags_st, NULL);
if (gst_structure_get_uint (tags_st, GST_TAG_BITRATE, &utmp) || if (gst_structure_get_uint (tags_st, GST_TAG_BITRATE, &utmp) ||
gst_structure_get_uint (tags_st, GST_TAG_NOMINAL_BITRATE, &utmp)) gst_structure_get_uint (tags_st, GST_TAG_NOMINAL_BITRATE, &utmp))
info->bitrate = utmp; info->bitrate = utmp;
@ -763,16 +761,14 @@ collect_information (GstDiscoverer * dc, const GstStructure * st,
if (gst_structure_id_has_field (st, _TAGS_QUARK)) { if (gst_structure_id_has_field (st, _TAGS_QUARK)) {
const gchar *language; const gchar *language;
gst_structure_id_get (st, _TAGS_QUARK, gst_structure_id_get (st, _TAGS_QUARK, GST_TYPE_TAG_LIST, &tags_st, NULL);
GST_TYPE_STRUCTURE, &tags_st, NULL);
language = gst_structure_get_string (caps_st, GST_TAG_LANGUAGE_CODE); language = gst_structure_get_string (caps_st, GST_TAG_LANGUAGE_CODE);
if (language) if (language)
info->language = g_strdup (language); info->language = g_strdup (language);
/* FIXME: Is it worth it to remove the tags we've parsed? */ /* FIXME: Is it worth it to remove the tags we've parsed? */
gst_discoverer_merge_and_replace_tags (&info->parent.tags, gst_discoverer_merge_and_replace_tags (&info->parent.tags, tags_st);
(GstTagList *) tags_st);
} }
if (!info->language && ((GstDiscovererStreamInfo *) info)->tags) { if (!info->language && ((GstDiscovererStreamInfo *) info)->tags) {
@ -798,9 +794,8 @@ collect_information (GstDiscoverer * dc, const GstStructure * st,
} }
if (gst_structure_id_get (st, _TAGS_QUARK, if (gst_structure_id_get (st, _TAGS_QUARK,
GST_TYPE_STRUCTURE, &tags_st, NULL)) { GST_TYPE_TAG_LIST, &tags_st, NULL)) {
gst_discoverer_merge_and_replace_tags (&info->tags, gst_discoverer_merge_and_replace_tags (&info->tags, tags_st);
(GstTagList *) tags_st);
} }
return info; return info;
@ -963,7 +958,7 @@ parse_stream_topology (GstDiscoverer * dc, const GstStructure * topology,
GstTagList *tmp; GstTagList *tmp;
gst_structure_id_get (topology, _TAGS_QUARK, gst_structure_id_get (topology, _TAGS_QUARK,
GST_TYPE_STRUCTURE, &tags, NULL); GST_TYPE_TAG_LIST, &tags, NULL);
GST_DEBUG ("Merge tags %" GST_PTR_FORMAT, tags); GST_DEBUG ("Merge tags %" GST_PTR_FORMAT, tags);
@ -1059,8 +1054,8 @@ discoverer_collect (GstDiscoverer * dc)
gst_caps_get_structure (dc->priv->current_info->stream_info->caps, 0); gst_caps_get_structure (dc->priv->current_info->stream_info->caps, 0);
if (g_str_has_prefix (gst_structure_get_name (st), "image/")) if (g_str_has_prefix (gst_structure_get_name (st), "image/"))
((GstDiscovererVideoInfo *) dc->priv->current_info->stream_info)-> ((GstDiscovererVideoInfo *) dc->priv->current_info->
is_image = TRUE; stream_info)->is_image = TRUE;
} }
} }