mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

discoverer: Add serializing unknown stream type support

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3911>
This commit is contained in:
Thibault Saunier 2023-04-21 17:53:34 -04:00
parent e8e5508d1d
commit 0f229aa62a
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
subprojects/gst-plugins-base/gst-libs/gst/pbutils/gstdiscoverer.c
View file

@ -2225,11 +2225,14 @@ gst_discoverer_info_to_variant_recurse (GstDiscovererStreamInfo * sinfo,
GstDiscovererStreamInfo *ninfo = GstDiscovererStreamInfo *ninfo =
gst_discoverer_stream_info_get_next (sinfo); gst_discoverer_stream_info_get_next (sinfo);
nextv = gst_discoverer_info_to_variant_recurse (ninfo, flags); if (ninfo) {
nextv = gst_discoverer_info_to_variant_recurse (ninfo, flags);
stream_variant = stream_variant =
g_variant_new ("(yvv)", 'n', common_stream_variant, g_variant_new ("(yvv)", 'n', common_stream_variant,
g_variant_new ("v", nextv)); g_variant_new ("v", nextv));
} else {
stream_variant = g_variant_new ("(yv)", 'n', common_stream_variant);
}
} }
return stream_variant; return stream_variant;
@ -2370,9 +2373,12 @@ _parse_discovery (GVariant * variant, GstDiscovererInfo * info)
{ {
gchar type; gchar type;
GVariant *common = g_variant_get_child_value (variant, 1); GVariant *common = g_variant_get_child_value (variant, 1);
GVariant *specific = g_variant_get_child_value (variant, 2); GVariant *specific = NULL;
GstDiscovererStreamInfo *sinfo = NULL; GstDiscovererStreamInfo *sinfo = NULL;
if (g_variant_n_children (variant) > 2)
specific = g_variant_get_child_value (variant, 2);
GET_FROM_TUPLE (variant, byte, 0, &type); GET_FROM_TUPLE (variant, byte, 0, &type);
switch (type) { switch (type) {
case 'c': case 'c':
@ -2434,7 +2440,8 @@ _parse_discovery (GVariant * variant, GstDiscovererInfo * info)
out: out:
g_variant_unref (common); g_variant_unref (common);
g_variant_unref (specific); if (specific)
g_variant_unref (specific);
g_variant_unref (variant); g_variant_unref (variant);
return sinfo; return sinfo;
} }
@ -2700,7 +2707,9 @@ gst_discoverer_info_to_variant (GstDiscovererInfo * info,
g_return_val_if_fail (GST_IS_DISCOVERER_INFO (info), NULL); g_return_val_if_fail (GST_IS_DISCOVERER_INFO (info), NULL);
g_return_val_if_fail (gst_discoverer_info_get_result (info) == g_return_val_if_fail (gst_discoverer_info_get_result (info) ==
GST_DISCOVERER_OK, NULL); GST_DISCOVERER_OK
|| gst_discoverer_info_get_result (info) ==
GST_DISCOVERER_MISSING_PLUGINS, NULL);
sinfo = gst_discoverer_info_get_stream_info (info); sinfo = gst_discoverer_info_get_stream_info (info);
stream_variant = gst_discoverer_info_to_variant_recurse (sinfo, flags); stream_variant = gst_discoverer_info_to_variant_recurse (sinfo, flags);