From 39ca8a97a2c6a39006a509ec1acaa6223486ab6a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sat, 8 Oct 2005 13:10:34 +0000 Subject: [PATCH] check/: Allow new clock message too. Original commit message from CVS: * check/gst/gstbin.c: (GST_START_TEST): * check/pipelines/cleanup.c: (GST_START_TEST): * check/pipelines/simple_launch_lines.c: (GST_START_TEST): Allow new clock message too. --- ChangeLog | 7 +++++++ check/gst/gstbin.c | 5 +++-- check/pipelines/cleanup.c | 3 ++- check/pipelines/simple_launch_lines.c | 11 ++++++----- tests/check/gst/gstbin.c | 5 +++-- tests/check/pipelines/cleanup.c | 3 ++- tests/check/pipelines/simple-launch-lines.c | 11 ++++++----- 7 files changed, 29 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd4fa54e11..ab9781281b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-10-08 Wim Taymans + + * check/gst/gstbin.c: (GST_START_TEST): + * check/pipelines/cleanup.c: (GST_START_TEST): + * check/pipelines/simple_launch_lines.c: (GST_START_TEST): + Allow new clock message too. + 2005-10-08 Wim Taymans * gst/gstmessage.c: (gst_message_new_error), diff --git a/check/gst/gstbin.c b/check/gst/gstbin.c index 020e9143a7..c04cce3e7d 100644 --- a/check/gst/gstbin.c +++ b/check/gst/gstbin.c @@ -279,10 +279,11 @@ GST_START_TEST (test_message_state_changed_children) == GST_STATE_CHANGE_SUCCESS); /* each object is referenced by one message - * sink might have an extra reference if it's still blocked on preroll */ + * sink might have an extra reference if it's still blocked on preroll + * pipeline posted a new-clock message too. */ ASSERT_OBJECT_REFCOUNT (src, "src", 2); ASSERT_OBJECT_REFCOUNT_BETWEEN (sink, "sink", 2, 3); - ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 2); + ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 3); pop_messages (bus, 3); fail_if ((gst_bus_pop (bus)) != NULL); diff --git a/check/pipelines/cleanup.c b/check/pipelines/cleanup.c index 926f2341a8..a35c923446 100644 --- a/check/pipelines/cleanup.c +++ b/check/pipelines/cleanup.c @@ -89,7 +89,8 @@ GST_START_TEST (test_pipeline_unref) sink = gst_bin_get_by_name (GST_BIN (pipeline), "sink"); fail_if (sink == NULL); - run_pipeline (pipeline, s, GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_EOS); + run_pipeline (pipeline, s, GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED, + GST_MESSAGE_EOS); count = GST_OBJECT_REFCOUNT_VALUE (src); fail_unless (count == 1, "src has a refcount of %d instead of 1", count); count = GST_OBJECT_REFCOUNT_VALUE (sink); diff --git a/check/pipelines/simple_launch_lines.c b/check/pipelines/simple_launch_lines.c index b69eb1050b..6506e20a7e 100644 --- a/check/pipelines/simple_launch_lines.c +++ b/check/pipelines/simple_launch_lines.c @@ -93,23 +93,24 @@ GST_START_TEST (test_2_elements) s = "fakesrc can-activate-push=false ! fakesink can-activate-pull=true"; run_pipeline (setup_pipeline (s), s, - GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_UNKNOWN); + GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_UNKNOWN); s = "fakesrc can-activate-push=true ! fakesink can-activate-pull=false"; run_pipeline (setup_pipeline (s), s, - GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_UNKNOWN); + GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_UNKNOWN); s = "fakesrc can-activate-push=false num-buffers=10 ! fakesink can-activate-pull=true"; run_pipeline (setup_pipeline (s), s, - GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_EOS); + GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_EOS); s = "fakesrc can-activate-push=true num-buffers=10 ! fakesink can-activate-pull=false"; run_pipeline (setup_pipeline (s), s, - GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_EOS); + GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_EOS); s = "fakesrc can-activate-push=false ! fakesink can-activate-pull=false"; ASSERT_CRITICAL (run_pipeline (setup_pipeline (s), s, - GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_UNKNOWN)); + GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED, + GST_MESSAGE_UNKNOWN)); } GST_END_TEST; diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c index 020e9143a7..c04cce3e7d 100644 --- a/tests/check/gst/gstbin.c +++ b/tests/check/gst/gstbin.c @@ -279,10 +279,11 @@ GST_START_TEST (test_message_state_changed_children) == GST_STATE_CHANGE_SUCCESS); /* each object is referenced by one message - * sink might have an extra reference if it's still blocked on preroll */ + * sink might have an extra reference if it's still blocked on preroll + * pipeline posted a new-clock message too. */ ASSERT_OBJECT_REFCOUNT (src, "src", 2); ASSERT_OBJECT_REFCOUNT_BETWEEN (sink, "sink", 2, 3); - ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 2); + ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 3); pop_messages (bus, 3); fail_if ((gst_bus_pop (bus)) != NULL); diff --git a/tests/check/pipelines/cleanup.c b/tests/check/pipelines/cleanup.c index 926f2341a8..a35c923446 100644 --- a/tests/check/pipelines/cleanup.c +++ b/tests/check/pipelines/cleanup.c @@ -89,7 +89,8 @@ GST_START_TEST (test_pipeline_unref) sink = gst_bin_get_by_name (GST_BIN (pipeline), "sink"); fail_if (sink == NULL); - run_pipeline (pipeline, s, GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_EOS); + run_pipeline (pipeline, s, GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED, + GST_MESSAGE_EOS); count = GST_OBJECT_REFCOUNT_VALUE (src); fail_unless (count == 1, "src has a refcount of %d instead of 1", count); count = GST_OBJECT_REFCOUNT_VALUE (sink); diff --git a/tests/check/pipelines/simple-launch-lines.c b/tests/check/pipelines/simple-launch-lines.c index b69eb1050b..6506e20a7e 100644 --- a/tests/check/pipelines/simple-launch-lines.c +++ b/tests/check/pipelines/simple-launch-lines.c @@ -93,23 +93,24 @@ GST_START_TEST (test_2_elements) s = "fakesrc can-activate-push=false ! fakesink can-activate-pull=true"; run_pipeline (setup_pipeline (s), s, - GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_UNKNOWN); + GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_UNKNOWN); s = "fakesrc can-activate-push=true ! fakesink can-activate-pull=false"; run_pipeline (setup_pipeline (s), s, - GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_UNKNOWN); + GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_UNKNOWN); s = "fakesrc can-activate-push=false num-buffers=10 ! fakesink can-activate-pull=true"; run_pipeline (setup_pipeline (s), s, - GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_EOS); + GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_EOS); s = "fakesrc can-activate-push=true num-buffers=10 ! fakesink can-activate-pull=false"; run_pipeline (setup_pipeline (s), s, - GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_EOS); + GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_EOS); s = "fakesrc can-activate-push=false ! fakesink can-activate-pull=false"; ASSERT_CRITICAL (run_pipeline (setup_pipeline (s), s, - GST_MESSAGE_STATE_CHANGED, GST_MESSAGE_UNKNOWN)); + GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED, + GST_MESSAGE_UNKNOWN)); } GST_END_TEST;