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

urisourcebin: Use iterator function where applicable

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2784>
This commit is contained in:
Edward Hervey 2022-10-25 11:15:05 +02:00 committed by GStreamer Marge Bot
parent 41617834d2
commit 80770fe0ec
1 changed files with 23 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
subprojects/gst-plugins-base/gst/playback/gsturisourcebin.c
View file

@ -2161,50 +2161,40 @@ free_output_slot_async (GstURISourceBin * urisrc, OutputSlotInfo * slot)
(GstElementCallAsyncFunc) call_free_output_slot, slot, NULL); (GstElementCallAsyncFunc) call_free_output_slot, slot, NULL);
} }
static void
unexpose_raw_pad_func (const GValue * item, GstURISourceBin * urisrc)
{
GstPad *pad = g_value_get_object (item);
ChildSrcPadInfo *info =
g_object_get_data (G_OBJECT (pad), "urisourcebin.srcpadinfo");
if (info && info->output_pad != NULL)
remove_output_pad (urisrc, info->output_pad);
}
static void static void
unexpose_src_pads (GstURISourceBin * urisrc, GstElement * element) unexpose_src_pads (GstURISourceBin * urisrc, GstElement * element)
{ {
GstIterator *pads_iter; GstIterator *pads_iter;
GValue item = { 0, };
gboolean done = FALSE;
pads_iter = gst_element_iterate_src_pads (element); pads_iter = gst_element_iterate_src_pads (element);
while (!done) { gst_iterator_foreach (pads_iter,
switch (gst_iterator_next (pads_iter, &item)) { (GstIteratorForeachFunction) unexpose_raw_pad_func, urisrc);
case GST_ITERATOR_ERROR:
/* FALLTHROUGH */
case GST_ITERATOR_DONE:
done = TRUE;
break;
case GST_ITERATOR_RESYNC:
gst_iterator_resync (pads_iter);
break;
case GST_ITERATOR_OK:
{
ChildSrcPadInfo *info;
GstPad *pad = g_value_get_object (&item);
if (!(info =
g_object_get_data (G_OBJECT (pad), "urisourcebin.srcpadinfo")))
break;
if (info->output_pad != NULL)
remove_output_pad (urisrc, info->output_pad);
g_value_reset (&item);
break;
}
}
}
g_value_unset (&item);
gst_iterator_free (pads_iter); gst_iterator_free (pads_iter);
} }
static void
remove_typefind (GstElement * typefind, GstURISourceBin * urisrc)
{
unexpose_src_pads (urisrc, typefind);
gst_element_set_state (typefind, GST_STATE_NULL);
gst_bin_remove (GST_BIN_CAST (urisrc), typefind);
}
/* remove source and all related elements */ /* remove source and all related elements */
static void static void
remove_source (GstURISourceBin * urisrc) remove_source (GstURISourceBin * urisrc)
{ {
if (urisrc->source) { if (urisrc->source) {
GstElement *source = urisrc->source; GstElement *source = urisrc->source;
@ -2221,17 +2211,8 @@ remove_source (GstURISourceBin * urisrc)
} }
if (urisrc->typefinds) { if (urisrc->typefinds) {
GList *iter, *next; GST_DEBUG_OBJECT (urisrc, "removing old typefind elements");
GST_DEBUG_OBJECT (urisrc, "removing old typefind element"); g_list_foreach (urisrc->typefinds, (GFunc) remove_typefind, urisrc);
for (iter = urisrc->typefinds; iter; iter = next) {
GstElement *typefind = iter->data;
next = g_list_next (iter);
unexpose_src_pads (urisrc, typefind);
gst_element_set_state (typefind, GST_STATE_NULL);
gst_bin_remove (GST_BIN_CAST (urisrc), typefind);
}
g_list_free (urisrc->typefinds); g_list_free (urisrc->typefinds);
urisrc->typefinds = NULL; urisrc->typefinds = NULL;
} }