mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-11 16:55:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

revert until fixed

Browse source 
Original commit message from CVS:
revert until fixed
This commit is contained in:
Thomas Vander Stichele 2004-07-02 14:01:04 +00:00
parent 11243f20be
commit 074bcabf93
2 changed files with 29 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-07-02 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/gstpad.c: (gst_pad_check_schedulers),
(gst_pad_can_link_filtered), (gst_pad_link_filtered),
(gst_pad_link_prepare):
revert until testsuite is fixed
2004-07-02 Thomas Vander Stichele <thomas at apestaart dot org> 2004-07-02 Thomas Vander Stichele <thomas at apestaart dot org>
* testsuite/Makefile.am: * testsuite/Makefile.am:

73
gst/gstpad.c
View file

@ -1053,44 +1053,16 @@ gst_pad_check_schedulers (GstRealPad * realsrc, GstRealPad * realsink)
src_sched = gst_pad_get_scheduler (GST_PAD (realsrc)); src_sched = gst_pad_get_scheduler (GST_PAD (realsrc));
sink_sched = gst_pad_get_scheduler (GST_PAD (realsink)); sink_sched = gst_pad_get_scheduler (GST_PAD (realsink));
if (GST_FLAG_IS_SET (GST_PAD_PARENT (realsrc), GST_ELEMENT_DECOUPLED)) if (src_sched && sink_sched) {
num_decoupled++; if (GST_FLAG_IS_SET (GST_PAD_PARENT (realsrc), GST_ELEMENT_DECOUPLED))
if (GST_FLAG_IS_SET (GST_PAD_PARENT (realsink), GST_ELEMENT_DECOUPLED)) num_decoupled++;
num_decoupled++; if (GST_FLAG_IS_SET (GST_PAD_PARENT (realsink), GST_ELEMENT_DECOUPLED))
num_decoupled++;
if (!src_sched && !sink_sched) { if (src_sched != sink_sched && num_decoupled != 1) {
if (num_decoupled == 0) { return FALSE;
GstObject *src_manager, *sink_manager;
/* figure out if the managers are equal */
src_manager = GST_OBJECT (gst_pad_get_parent (GST_PAD (realsrc)));
while (!GST_FLAG_IS_SET (src_manager, GST_BIN_FLAG_MANAGER)) {
if (!gst_object_get_parent (src_manager))
break;
src_manager = gst_object_get_parent (src_manager);
}
sink_manager = GST_OBJECT (gst_pad_get_parent (GST_PAD (realsink)));
while (!GST_FLAG_IS_SET (sink_manager, GST_BIN_FLAG_MANAGER)) {
if (!gst_object_get_parent (sink_manager))
break;
sink_manager = gst_object_get_parent (sink_manager);
}
if (sink_manager != src_manager)
return FALSE;
} }
} else {
if (!src_sched
&& !GST_FLAG_IS_SET (GST_PAD_PARENT (realsrc), GST_ELEMENT_DECOUPLED))
return FALSE;
if (!sink_sched
&& !GST_FLAG_IS_SET (GST_PAD_PARENT (realsink), GST_ELEMENT_DECOUPLED))
return FALSE;
} }
if (src_sched != sink_sched && num_decoupled != 1) {
return FALSE;
}
return TRUE; return TRUE;
} }
@ -1702,10 +1674,8 @@ gst_pad_can_link_filtered (GstPad * srcpad, GstPad * sinkpad,
} }
if (!gst_pad_check_schedulers (realsrc, realsink)) { if (!gst_pad_check_schedulers (realsrc, realsink)) {
GST_CAT_INFO (GST_CAT_CAPS, "schedulers for pads %s:%s and %s:%s weren't " g_warning ("linking pads with different scheds requires "
"equal (or didn't exist at all). Linking pads with different " "exactly one decoupled element (such as queue)");
"schedulers requires exactly one decoupled element (such as queue)",
GST_DEBUG_PAD_NAME (realsrc), GST_DEBUG_PAD_NAME (realsink));
return FALSE; return FALSE;
} }
@ -1825,10 +1795,8 @@ gst_pad_link_filtered (GstPad * srcpad, GstPad * sinkpad,
} }
if (!gst_pad_check_schedulers (realsrc, realsink)) { if (!gst_pad_check_schedulers (realsrc, realsink)) {
g_warning ("schedulers for pads %s:%s and %s:%s weren't " g_warning ("linking pads with different scheds requires "
"equal (or didn't exist at all). Linking pads with different " "exactly one decoupled element (such as queue)");
"schedulers requires exactly one decoupled element (such as queue)",
GST_DEBUG_PAD_NAME (realsrc), GST_DEBUG_PAD_NAME (realsink));
return FALSE; return FALSE;
} }
@ -1876,11 +1844,16 @@ gst_pad_link_filtered (GstPad * srcpad, GstPad * sinkpad,
src_sched = gst_pad_get_scheduler (GST_PAD (link->srcpad)); src_sched = gst_pad_get_scheduler (GST_PAD (link->srcpad));
sink_sched = gst_pad_get_scheduler (GST_PAD (link->sinkpad)); sink_sched = gst_pad_get_scheduler (GST_PAD (link->sinkpad));
/* should have been checked by gst_pad_check_schedulers */
g_assert (src_sched == sink_sched);
g_assert (sink_sched != NULL);
/* now tell the scheduler */ /* now tell the scheduler */
gst_scheduler_pad_link (src_sched, link->srcpad, link->sinkpad); if (src_sched && src_sched == sink_sched) {
gst_scheduler_pad_link (src_sched,
GST_PAD (link->srcpad), GST_PAD (link->sinkpad));
} else {
GST_CAT_INFO (GST_CAT_PADS,
"not telling link to scheduler %s:%s and %s:%s, %p %p",
GST_DEBUG_PAD_NAME (link->srcpad), GST_DEBUG_PAD_NAME (link->sinkpad),
src_sched, sink_sched);
}
GST_CAT_INFO (GST_CAT_PADS, "linked %s:%s and %s:%s, successful", GST_CAT_INFO (GST_CAT_PADS, "linked %s:%s and %s:%s, successful",
GST_DEBUG_PAD_NAME (link->srcpad), GST_DEBUG_PAD_NAME (link->sinkpad)); GST_DEBUG_PAD_NAME (link->srcpad), GST_DEBUG_PAD_NAME (link->sinkpad));
@ -2234,10 +2207,8 @@ gst_pad_link_prepare (GstPad * srcpad, GstPad * sinkpad,
g_return_val_if_fail (GST_PAD_PARENT (realsink) != NULL, NULL); g_return_val_if_fail (GST_PAD_PARENT (realsink) != NULL, NULL);
if (!gst_pad_check_schedulers (realsrc, realsink)) { if (!gst_pad_check_schedulers (realsrc, realsink)) {
g_warning ("schedulers for pads %s:%s and %s:%s weren't " g_warning ("linking pads with different scheds requires "
"equal (or didn't exist at all). Linking pads with different " "exactly one decoupled element (such as queue)");
"schedulers requires exactly one decoupled element (such as queue)",
GST_DEBUG_PAD_NAME (realsrc), GST_DEBUG_PAD_NAME (realsink));
return NULL; return NULL;
} }