mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 02:00:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

discoverer: Serialize/load "next" StreamInfo in GVariants

Browse source 
See https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/398
This commit is contained in:
Thibault Saunier 2017-11-08 13:25:08 -03:00
parent 54920276b0
commit 4014995d0c
1 changed files with 43 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -211,6 +211,10 @@ static void gst_discoverer_get_property (GObject * object, guint prop_id,
static gboolean _setup_locked (GstDiscoverer * dc);
static void handle_current_async (GstDiscoverer * dc);
static gboolean emit_discovererd_and_next (GstDiscoverer * dc);
static GVariant *gst_discoverer_info_to_variant_recurse (GstDiscovererStreamInfo
* sinfo, GstDiscovererSerializeFlags flags);
static GstDiscovererStreamInfo *_parse_discovery (GVariant * variant,
GstDiscovererInfo * info);
static void
gst_discoverer_class_init (GstDiscovererClass * klass)
@ -2055,6 +2059,7 @@ _serialize_common_stream_info (GstDiscovererStreamInfo * sinfo,
GstDiscovererSerializeFlags flags)
{
GVariant *common;
GVariant *nextv = NULL;
gchar *caps_str = NULL, *tags_str = NULL, *misc_str = NULL;
if (sinfo->caps && (flags & GST_DISCOVERER_SERIALIZE_CAPS))
@ -2066,9 +2071,15 @@ _serialize_common_stream_info (GstDiscovererStreamInfo * sinfo,
if (sinfo->misc && (flags & GST_DISCOVERER_SERIALIZE_MISC))
misc_str = gst_structure_to_string (sinfo->misc);
if (sinfo->next)
nextv = gst_discoverer_info_to_variant_recurse (sinfo->next, flags);
else
nextv = g_variant_new ("()");
common =
g_variant_new ("(msmsmsms)", sinfo->stream_id, caps_str, tags_str,
misc_str);
g_variant_new ("(msmsmsmsv)", sinfo->stream_id, caps_str, tags_str,
misc_str, nextv);
g_free (caps_str);
g_free (tags_str);
@ -2173,6 +2184,16 @@ gst_discoverer_info_to_variant_recurse (GstDiscovererStreamInfo * sinfo,
stream_variant =
g_variant_new ("(yvv)", 's', common_stream_variant,
subtitle_stream_info);
} else {
GVariant *nextv = NULL;
GstDiscovererStreamInfo *ninfo =
gst_discoverer_stream_info_get_next (sinfo);
nextv = gst_discoverer_info_to_variant_recurse (ninfo, flags);
stream_variant =
g_variant_new ("(yvv)", 'n', common_stream_variant,
g_variant_new ("v", nextv));
}
return stream_variant;
@ -2220,7 +2241,8 @@ _parse_info (GstDiscovererInfo * info, GVariant * info_variant)
}
static void
_parse_common_stream_info (GstDiscovererStreamInfo * sinfo, GVariant * common)
_parse_common_stream_info (GstDiscovererStreamInfo * sinfo, GVariant * common,
GstDiscovererInfo * info)
{
const gchar *str;
@ -2240,6 +2262,15 @@ _parse_common_stream_info (GstDiscovererStreamInfo * sinfo, GVariant * common)
if (str)
sinfo->misc = gst_structure_new_from_string (str);
if (g_variant_n_children (common) > 4) {
GVariant *nextv;
GET_FROM_TUPLE (common, variant, 4, &nextv);
if (g_variant_n_children (nextv) > 0) {
sinfo->next = _parse_discovery (nextv, info);
}
}
g_variant_unref (common);
}
@ -2325,12 +2356,16 @@ _parse_discovery (GVariant * variant, GstDiscovererInfo * info)
_parse_subtitle_stream_info (GST_DISCOVERER_SUBTITLE_INFO (sinfo),
g_variant_get_child_value (specific, 0));
break;
case 'n':
sinfo = g_object_new (GST_TYPE_DISCOVERER_STREAM_INFO, NULL);
break;
default:
GST_WARNING ("Unexpected discoverer info type %d", type);
goto out;
}
_parse_common_stream_info (sinfo, g_variant_get_child_value (common, 0));
_parse_common_stream_info (sinfo, g_variant_get_child_value (common, 0),
info);
info->stream_list = g_list_append (info->stream_list, sinfo);
@ -2617,7 +2652,7 @@ gst_discoverer_info_to_variant (GstDiscovererInfo * info,
{
/* FIXME: implement TOC support */
GVariant *stream_variant;
GVariant *variant;
GVariant *variant, *info_variant;
GstDiscovererStreamInfo *sinfo;
GVariant *wrapper;
@ -2627,8 +2662,9 @@ gst_discoverer_info_to_variant (GstDiscovererInfo * info,
sinfo = gst_discoverer_info_get_stream_info (info);
stream_variant = gst_discoverer_info_to_variant_recurse (sinfo, flags);
variant =
g_variant_new ("(vv)", _serialize_info (info, flags), stream_variant);
info_variant = _serialize_info (info, flags);
variant = g_variant_new ("(vv)", info_variant, stream_variant);
/* Returning a wrapper implies some small overhead, but simplifies
* deserializing from bytes */