mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

discoverer: Fix accumulating discoverer info when loading from cache

Browse source 
With the previous accumualator loading stopped after the first handler,
even if it return NULL which is unexpected, instead we want to use the
first non-value returned by handlers.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5665>
This commit is contained in:
Thibault Saunier 2023-10-12 13:18:44 -03:00 committed by GStreamer Marge Bot
parent 23a4b72631
commit a2bb04c899
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -219,6 +219,21 @@ static GstDiscovererStreamInfo *_parse_discovery (GVariant * variant,
static GstDiscovererInfo *load_serialized_info (GstDiscoverer * dc, static GstDiscovererInfo *load_serialized_info (GstDiscoverer * dc,
gchar * uri); gchar * uri);
static gboolean
_gst_discoverer_info_accumulator (GSignalInvocationHint * ihint,
GValue * return_accu, const GValue * handler_return, gpointer dummy)
{
GstDiscovererInfo *info;
info = g_value_get_object (handler_return);
GST_DEBUG ("got discoverer info %" GST_PTR_FORMAT, info);
g_value_set_object (return_accu, info);
/* stop emission if we have a discoverer info */
return (info == NULL);
}
static void static void
gst_discoverer_class_init (GstDiscovererClass * klass) gst_discoverer_class_init (GstDiscovererClass * klass)
{ {
@ -346,7 +361,7 @@ gst_discoverer_class_init (GstDiscovererClass * klass)
gst_discoverer_signals[SIGNAL_LOAD_SERIALIZED_INFO] = gst_discoverer_signals[SIGNAL_LOAD_SERIALIZED_INFO] =
g_signal_new ("load-serialized-info", G_TYPE_FROM_CLASS (klass), g_signal_new ("load-serialized-info", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDiscovererClass, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDiscovererClass,
load_serialize_info), g_signal_accumulator_first_wins, NULL, NULL, load_serialize_info), _gst_discoverer_info_accumulator, NULL, NULL,
GST_TYPE_DISCOVERER_INFO, 1, G_TYPE_STRING); GST_TYPE_DISCOVERER_INFO, 1, G_TYPE_STRING);
} }