mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 05:01:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

discoverer: Fix serializing tags StreamInfo on disc

Browse source 
When `use-cache` is used, we were serializing the StreamInfo **before**
_ensure_info_tags was called, meaning we were always missing that information.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7733>
This commit is contained in:
Thibault Saunier 2024-10-22 19:04:40 -03:00 committed by GStreamer Marge Bot
parent 6bbddc683d
commit 5ed2af5083
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1354,7 +1354,7 @@ setup_next_uri_locked (GstDiscoverer * dc)
} }
} }
static GstDiscovererInfo * static void
_ensure_info_tags (GstDiscoverer * dc) _ensure_info_tags (GstDiscoverer * dc)
{ {
GstDiscovererInfo *info = dc->priv->current_info; GstDiscovererInfo *info = dc->priv->current_info;
@ -1362,16 +1362,32 @@ _ensure_info_tags (GstDiscoverer * dc)
if (dc->priv->all_tags) if (dc->priv->all_tags)
info->tags = dc->priv->all_tags; info->tags = dc->priv->all_tags;
dc->priv->all_tags = NULL; dc->priv->all_tags = NULL;
return info; }
static void
serialize_info_if_required (GstDiscoverer * dc, GstDiscovererInfo * info)
{
if (dc->priv->use_cache && info->cachefile
&& info->result == GST_DISCOVERER_OK) {
GVariant *variant = gst_discoverer_info_to_variant (info,
GST_DISCOVERER_SERIALIZE_ALL);
g_file_set_contents (info->cachefile,
g_variant_get_data (variant), g_variant_get_size (variant), NULL);
g_variant_unref (variant);
}
} }
static void static void
emit_discovererd (GstDiscoverer * dc) emit_discovererd (GstDiscoverer * dc)
{ {
GstDiscovererInfo *info = _ensure_info_tags (dc); GstDiscovererInfo *info = dc->priv->current_info;
GST_DEBUG_OBJECT (dc, "Emitting 'discoverered' %s", info->uri); GST_DEBUG_OBJECT (dc, "Emitting 'discoverered' %s", info->uri);
g_signal_emit (dc, gst_discoverer_signals[SIGNAL_DISCOVERED], 0, g_signal_emit (dc, gst_discoverer_signals[SIGNAL_DISCOVERED], 0,
info, dc->priv->current_error); info, dc->priv->current_error);
/* Clients get a copy of current_info since it is a boxed type */ /* Clients get a copy of current_info since it is a boxed type */
gst_discoverer_info_unref (dc->priv->current_info); gst_discoverer_info_unref (dc->priv->current_info);
dc->priv->current_info = NULL; dc->priv->current_info = NULL;
@ -1503,16 +1519,8 @@ discoverer_collect (GstDiscoverer * dc)
} }
} }
if (dc->priv->use_cache && dc->priv->current_info->cachefile && _ensure_info_tags (dc);
dc->priv->current_info->result == GST_DISCOVERER_OK) { serialize_info_if_required (dc, dc->priv->current_info);
GVariant *variant = gst_discoverer_info_to_variant (dc->priv->current_info,
GST_DISCOVERER_SERIALIZE_ALL);
g_file_set_contents (dc->priv->current_info->cachefile,
g_variant_get_data (variant), g_variant_get_size (variant), NULL);
g_variant_unref (variant);
}
if (dc->priv->async) if (dc->priv->async)
emit_discovererd (dc); emit_discovererd (dc);
} }
@ -1845,7 +1853,7 @@ _get_info_from_cachefile (GstDiscoverer * dc, gchar * cachefile)
g_free (cachefile); g_free (cachefile);
} }
GST_INFO_OBJECT (dc, "Got info from cache: %p", info); GST_INFO_OBJECT (dc, "Got info from cache: %p %s", info, info->cachefile);
g_free (data); g_free (data);
return info; return info;
@ -2635,8 +2643,8 @@ gst_discoverer_discover_uri (GstDiscoverer * discoverer, const gchar * uri,
discoverer->priv->current_info->result); discoverer->priv->current_info->result);
discoverer->priv->current_info->result = res; discoverer->priv->current_info->result = res;
} }
info = _ensure_info_tags (discoverer);
info = discoverer->priv->current_info;
discoverer_cleanup (discoverer); discoverer_cleanup (discoverer);
return info; return info;