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: Move cache file tracking from GstDiscovererInfo into GstDiscoverer

Browse source 
It's only used temporarily during discovery and makes no sense as part of the
resulting info.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7969>
This commit is contained in:
Sebastian Dröge 2024-11-26 15:32:56 +02:00 committed by GStreamer Marge Bot
parent 9e4c173c3c
commit 27a2fa73bc
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -393,8 +393,6 @@ gst_discoverer_info_finalize (GObject * object)
if (info->toc) if (info->toc)
gst_toc_unref (info->toc); gst_toc_unref (info->toc);
g_free (info->cachefile);
g_ptr_array_unref (info->missing_elements_details); g_ptr_array_unref (info->missing_elements_details);
G_OBJECT_CLASS (gst_discoverer_info_parent_class)->finalize (object); G_OBJECT_CLASS (gst_discoverer_info_parent_class)->finalize (object);

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

@ -97,6 +97,8 @@ struct _GstDiscovererPrivate
gint current_info_stream_count; gint current_info_stream_count;
GError *current_error; GError *current_error;
GstStructure *current_topology; GstStructure *current_topology;
gchar *current_cachefile;
gboolean current_info_from_cache;
GstTagList *all_tags; GstTagList *all_tags;
GstTagList *global_tags; GstTagList *global_tags;
@ -1369,12 +1371,12 @@ static void
serialize_info_if_required (GstDiscoverer * dc, GstDiscovererInfo * info) serialize_info_if_required (GstDiscoverer * dc, GstDiscovererInfo * info)
{ {
if (dc->priv->use_cache && info->cachefile if (dc->priv->use_cache && dc->priv->current_cachefile
&& info->result == GST_DISCOVERER_OK) { && info->result == GST_DISCOVERER_OK) {
GVariant *variant = gst_discoverer_info_to_variant (info, GVariant *variant = gst_discoverer_info_to_variant (info,
GST_DISCOVERER_SERIALIZE_ALL); GST_DISCOVERER_SERIALIZE_ALL);
g_file_set_contents (info->cachefile, g_file_set_contents (dc->priv->current_cachefile,
g_variant_get_data (variant), g_variant_get_size (variant), NULL); g_variant_get_data (variant), g_variant_get_size (variant), NULL);
g_variant_unref (variant); g_variant_unref (variant);
} }
@ -1392,6 +1394,9 @@ emit_discovered (GstDiscoverer * dc)
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;
dc->priv->current_info_stream_count = 0; dc->priv->current_info_stream_count = 0;
g_free (dc->priv->current_cachefile);
dc->priv->current_cachefile = NULL;
dc->priv->current_info_from_cache = FALSE;
} }
static gboolean static gboolean
@ -1419,7 +1424,7 @@ discoverer_collect (GstDiscoverer * dc)
} }
if (dc->priv->use_cache && dc->priv->current_info if (dc->priv->use_cache && dc->priv->current_info
&& dc->priv->current_info->from_cache) { && dc->priv->current_info_from_cache) {
GST_DEBUG_OBJECT (dc, GST_DEBUG_OBJECT (dc,
"Nothing to collect as the info was built from" " the cache"); "Nothing to collect as the info was built from" " the cache");
return; return;
@ -1852,13 +1857,14 @@ _get_info_from_cachefile (GstDiscoverer * dc, gchar * cachefile)
g_variant_unref (variant); g_variant_unref (variant);
if (info) { if (info) {
info->cachefile = cachefile; dc->priv->current_cachefile = cachefile;
info->from_cache = (gpointer) 0x01; dc->priv->current_info_from_cache = TRUE;
} else { } else {
g_free (cachefile); g_free (cachefile);
} }
GST_INFO_OBJECT (dc, "Got info from cache: %p %s", info, info->cachefile); GST_INFO_OBJECT (dc, "Got info from cache: %p %s", info,
dc->priv->current_cachefile);
g_free (data); g_free (data);
return info; return info;
@ -1915,7 +1921,7 @@ _setup_locked (GstDiscoverer * dc)
(GstDiscovererInfo *) g_object_new (GST_TYPE_DISCOVERER_INFO, NULL); (GstDiscovererInfo *) g_object_new (GST_TYPE_DISCOVERER_INFO, NULL);
dc->priv->current_info_stream_count = 0; dc->priv->current_info_stream_count = 0;
if (dc->priv->use_cache) if (dc->priv->use_cache)
dc->priv->current_info->cachefile = _serialized_info_get_path (dc, uri); dc->priv->current_cachefile = _serialized_info_get_path (dc, uri);
dc->priv->current_info->uri = uri; dc->priv->current_info->uri = uri;
/* set uri on uridecodebin */ /* set uri on uridecodebin */
@ -1983,6 +1989,9 @@ discoverer_cleanup (GstDiscoverer * dc)
dc->priv->current_info = NULL; dc->priv->current_info = NULL;
dc->priv->current_info_stream_count = 0; dc->priv->current_info_stream_count = 0;
g_free (dc->priv->current_cachefile);
dc->priv->current_cachefile = NULL;
dc->priv->current_info_from_cache = FALSE;
if (dc->priv->all_tags) { if (dc->priv->all_tags) {
gst_tag_list_unref (dc->priv->all_tags); gst_tag_list_unref (dc->priv->all_tags);

3
subprojects/gst-plugins-base/gst-libs/gst/pbutils/pbutils-private.h
View file

@ -97,9 +97,6 @@ struct _GstDiscovererInfo {
gboolean live; gboolean live;
gboolean seekable; gboolean seekable;
GPtrArray *missing_elements_details; GPtrArray *missing_elements_details;
gchar *cachefile;
gpointer from_cache;
}; };
/* missing-plugins.c */ /* missing-plugins.c */