fix for #147819 (Add some checks in the opt scheduler)

Original commit message from CVS:
fix for #147819 (Add some checks in the opt scheduler)

diff --git a/ChangeLog b/ChangeLog
index b199f926ee82a8c1b6415f6c8c7d9173625388d7..5d627963ec91535558902c6244a387b33f956b0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-07-20  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       patch by: Wim Taymans
+
+       * gst/schedulers/gstoptimalscheduler.c: (group_has_element),
+       (gst_opt_scheduler_schedule_run_queue),
+       (gst_opt_scheduler_get_wrapper), (get_group),
+       (group_migrate_connected):
+       * testsuite/schedulers/Makefile.am:
+         fix for #147819 (Add some checks in the opt scheduler)
+
 2004-07-20  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        patch by: Benjamin Otte

diff --git a/gst/schedulers/gstoptimalscheduler.c b/gst/schedulers/gstoptimalscheduler.c
index ac2a0e2d5fbe6fe263ab158553a5cb39adb9f847..92969bdcd9057f0420a351dfa8dec3f8b7adfb82 100644 (file)
--- a/gst/schedulers/gstoptimalscheduler.c
+++ b/gst/schedulers/gstoptimalscheduler.c
@@ -234,6 +234,7 @@ static void group_error_handler (GstOptSchedulerGroup * group);
 static void group_element_set_enabled (GstOptSchedulerGroup * group,
     GstElement * element, gboolean enabled);
 static gboolean schedule_group (GstOptSchedulerGroup * group);
+static void get_group (GstElement * element, GstOptSchedulerGroup ** group);
 
 
 /* 
@@ -1203,7 +1204,13 @@ gst_opt_scheduler_schedule_run_queue (GstOptScheduler * osched)
 
     GST_LOG_OBJECT (osched, "scheduling group %p", group);
 
-    res = schedule_group (group);
+    if (GST_OPT_SCHEDULER_GROUP_IS_ENABLED (group)) {
+      res = schedule_group (group);
+    } else {
+      GST_INFO_OBJECT (osched,
+          "group was disabled while it was on the queue, not scheduling");
+      res = TRUE;
+    }
     if (!res) {
       g_warning ("error scheduling group %p", group);
       group_error_handler (group);
@@ -1419,10 +1426,10 @@ gst_opt_scheduler_get_wrapper (GstPad * srcpad)
   GST_LOG ("need to schedule the peer element");
 
   /* else we need to schedule the peer element */
-  group = GST_ELEMENT_SCHED_GROUP (GST_PAD_PARENT (srcpad));
+  get_group (GST_PAD_PARENT (srcpad), &group);
   if (group == NULL) {
     /* wow, peer has no group */
-    g_warning ("peer without group detected");
+    GST_LOG ("peer without group detected");
     //group_error_handler (group);
     return GST_DATA (gst_event_new (GST_EVENT_INTERRUPT));
   }
@@ -1610,8 +1617,6 @@ get_group (GstElement * element, GstOptSchedulerGroup ** group)
 {
   GstOptSchedulerCtx *ctx;
 
-  /*GList *pads; */
-
   ctx = GST_ELEMENT_SCHED_CONTEXT (element);
   if (ctx)
     *group = ctx->group;

diff --git a/tests/old/testsuite/schedulers/Makefile.am b/tests/old/testsuite/schedulers/Makefile.am
index 5ca979cde013772b845db0ca5846b3aa95ed5c01..147b59446a814fd3c204d3511ba881c8cd1cffce 100644 (file)
--- a/tests/old/testsuite/schedulers/Makefile.am
+++ b/tests/old/testsuite/schedulers/Makefile.am
@@ -4,12 +4,12 @@ tests_pass = \
        unlink_src unlink_sink \
        relink_src relink_sink \
        unref_src unref_sink \
-       143777 143777-2 147713 147894
+       143777 143777-2 147713 147819 147894
 
 # don't enable this one unless it actually works.
 #      useless_iteration
 
-tests_fail = 142183 142183-2 147819
+tests_fail = 142183 142183-2
 tests_ignore =
 
 unlink_src_SOURCES = unlink.c

diff --git a/testsuite/schedulers/Makefile.am b/testsuite/schedulers/Makefile.am
index 5ca979cde013772b845db0ca5846b3aa95ed5c01..147b59446a814fd3c204d3511ba881c8cd1cffce 100644 (file)
--- a/testsuite/schedulers/Makefile.am
+++ b/testsuite/schedulers/Makefile.am
@@ -4,12 +4,12 @@ tests_pass = \
        unlink_src unlink_sink \
        relink_src relink_sink \
        unref_src unref_sink \
-       143777 143777-2 147713 147894
+       143777 143777-2 147713 147819 147894
 
 # don't enable this one unless it actually works.
 #      useless_iteration
 
-tests_fail = 142183 142183-2 147819
+tests_fail = 142183 142183-2
 tests_ignore =
 
 unlink_src_SOURCES = unlink.c