mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-02 14:36:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

Combine finding and creating groups

Browse source 
Combine the search for the current group and optionally creating one into one
function so that we can avoid taking the lock multiple times.
This commit is contained in:
Wim Taymans 2009-02-25 10:05:38 +01:00
parent 2968cc8710
commit 0b2238b70b
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gst/playback/gstdecodebin2.c
View file

@ -931,7 +931,8 @@ static void pad_removed_cb (GstElement * element, GstPad * pad,
GstDecodeBin * dbin); GstDecodeBin * dbin);
static void no_more_pads_cb (GstElement * element, GstDecodeBin * dbin); static void no_more_pads_cb (GstElement * element, GstDecodeBin * dbin);
static GstDecodeGroup *get_current_group (GstDecodeBin * dbin); static GstDecodeGroup *get_current_group (GstDecodeBin * dbin,
gboolean create, gboolean demux, gboolean * created);
/* called when a new pad is discovered. It will perform some basic actions /* called when a new pad is discovered. It will perform some basic actions
* before trying to link something to it. * before trying to link something to it.
@ -1106,13 +1107,7 @@ connect_pad (GstDecodeBin * dbin, GstElement * src, GstDecodePad * dpad,
GST_LOG_OBJECT (src, "is a demuxer, connecting the pad through multiqueue"); GST_LOG_OBJECT (src, "is a demuxer, connecting the pad through multiqueue");
if (!group) if (!group)
if (!(group = get_current_group (dbin))) { group = get_current_group (dbin, TRUE, TRUE, NULL);
group = gst_decode_group_new (dbin, TRUE);
DECODE_BIN_LOCK (dbin);
GST_LOG_OBJECT (dbin, "added group %p", group);
dbin->groups = g_list_append (dbin->groups, group);
DECODE_BIN_UNLOCK (dbin);
}
gst_ghost_pad_set_target (GST_GHOST_PAD (dpad), NULL); gst_ghost_pad_set_target (GST_GHOST_PAD (dpad), NULL);
if (!(mqpad = gst_decode_group_control_demuxer_pad (group, pad))) if (!(mqpad = gst_decode_group_control_demuxer_pad (group, pad)))
@ -1385,14 +1380,7 @@ expose_pad (GstDecodeBin * dbin, GstElement * src, GstDecodePad * dpad,
isdemux = is_demuxer_element (src); isdemux = is_demuxer_element (src);
if (!group) if (!group)
if (!(group = get_current_group (dbin))) { group = get_current_group (dbin, TRUE, isdemux, &newgroup);
group = gst_decode_group_new (dbin, isdemux);
DECODE_BIN_LOCK (dbin);
GST_LOG_OBJECT (dbin, "added group %p", group);
dbin->groups = g_list_append (dbin->groups, group);
DECODE_BIN_UNLOCK (dbin);
newgroup = TRUE;
}
if (isdemux) { if (isdemux) {
GST_LOG_OBJECT (src, "connecting the pad through multiqueue"); GST_LOG_OBJECT (src, "connecting the pad through multiqueue");
@ -1529,7 +1517,7 @@ no_more_pads_cb (GstElement * element, GstDecodeBin * dbin)
GST_LOG_OBJECT (element, "No more pads, setting current group to complete"); GST_LOG_OBJECT (element, "No more pads, setting current group to complete");
/* Find the non-complete group, there should only be one */ /* Find the non-complete group, there should only be one */
if (!(group = get_current_group (dbin))) if (!(group = get_current_group (dbin, FALSE, FALSE, NULL)))
goto no_group; goto no_group;
gst_decode_group_set_complete (group); gst_decode_group_set_complete (group);
@ -1719,13 +1707,18 @@ gst_decode_group_new (GstDecodeBin * dbin, gboolean use_queue)
} }
/* get_current_group: /* get_current_group:
* @dbin: the decodebin
* @create: create the group when not present
* @as_demux: create the group as a demuxer
* @created: result when the group was created
* *
* Returns the current non-completed group. * Returns the current non-completed group.
* *
* Returns: %NULL if no groups are available, or all groups are completed. * Returns: %NULL if no groups are available, or all groups are completed.
*/ */
static GstDecodeGroup * static GstDecodeGroup *
get_current_group (GstDecodeBin * dbin) get_current_group (GstDecodeBin * dbin, gboolean create, gboolean as_demux,
gboolean * created)
{ {
GList *tmp; GList *tmp;
GstDecodeGroup *group = NULL; GstDecodeGroup *group = NULL;
@ -1741,6 +1734,13 @@ get_current_group (GstDecodeBin * dbin)
break; break;
} }
} }
if (group == NULL && create) {
group = gst_decode_group_new (dbin, as_demux);
GST_LOG_OBJECT (dbin, "added group %p, demux %d", group, as_demux);
dbin->groups = g_list_append (dbin->groups, group);
if (created)
*created = TRUE;
}
DECODE_BIN_UNLOCK (dbin); DECODE_BIN_UNLOCK (dbin);
GST_LOG_OBJECT (dbin, "Returning group %p", group); GST_LOG_OBJECT (dbin, "Returning group %p", group);
@ -1976,7 +1976,7 @@ sort_end_pads (GstDecodePad * da, GstDecodePad * db)
* *
* Expose this group's pads. * Expose this group's pads.
* *
* Not MT safe, please take the group lock * Not MT safe, please take the decodebin lock
*/ */
static gboolean static gboolean
gst_decode_group_expose (GstDecodeGroup * group) gst_decode_group_expose (GstDecodeGroup * group)