From 261abbb01e959952784b2f51e9654c3c43bdc272 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 21 Dec 2006 15:00:08 +0000 Subject: [PATCH] docs/design/part-states.txt: two tiny additional comments Original commit message from CVS: * docs/design/part-states.txt: two tiny additional comments * gst/gststructure.c: doc fixing * tests/check/Makefile.am: * tests/check/elements/queue.c: (queue_overrun), (queue_underrun), (GST_START_TEST): disable test for now, unless it gets fixed --- ChangeLog | 13 +++++++++++++ docs/design/part-states.txt | 9 +++++---- gst/gststructure.c | 4 ++-- tests/check/Makefile.am | 4 ++-- tests/check/elements/queue.c | 8 +++++--- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index db1b6b7..4fa24d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2006-12-21 Stefan Kost + * docs/design/part-states.txt: + two tiny additional comments + + * gst/gststructure.c: + doc fixing + + * tests/check/Makefile.am: + * tests/check/elements/queue.c: (queue_overrun), (queue_underrun), + (GST_START_TEST): + disable test for now, unless it gets fixed + +2006-12-21 Stefan Kost + * tests/check/elements/queue.c: (queue_overrun), (queue_underrun), (GST_START_TEST): fix race in underrun test diff --git a/docs/design/part-states.txt b/docs/design/part-states.txt index 611a503..a53ff04 100644 --- a/docs/design/part-states.txt +++ b/docs/design/part-states.txt @@ -29,13 +29,14 @@ State transitions the following state changes are possible: NULL -> READY - - The element must check if the resources it needs are available. - Audiosinks typically try to probe the device. + - The element must check if the resources it needs are available. + Device sinks and -sources typically try to probe the device to constain + their caps. READY -> PAUSED - The element opens the device and prepares itself for PLAYING. - - the element pads are activated in order to receive data in PAUSED. - streaming threads are started. + - the element pads are activated in order to receive data in PAUSED. + Streaming threads are started. - some elements might need to return ASYNC and complete the state change when they have enough information. It is a requirement for sinks to return ASYNC and complete the state change when they receive the first diff --git a/gst/gststructure.c b/gst/gststructure.c index 9517dbf..42f59e7 100644 --- a/gst/gststructure.c +++ b/gst/gststructure.c @@ -1016,9 +1016,9 @@ gst_structure_get_boolean (const GstStructure * structure, * given field. Caller is responsible for making sure the field exists * and has the correct type. * - * Returns: TRUE if the value could be set correctly. If there was no field + * Returns: %TRUE if the value could be set correctly. If there was no field * with @fieldname or the existing field did not contain an int, this function - * returns FALSE. + * returns %FALSE. */ gboolean gst_structure_get_int (const GstStructure * structure, diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 4314044..6162289 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -59,7 +59,6 @@ REGISTRY_CHECKS = \ elements/fdsrc \ elements/filesrc \ elements/identity \ - elements/queue \ libs/basesrc \ libs/controller \ libs/typefindhelper \ @@ -95,8 +94,9 @@ check_PROGRAMS = \ # failing tests noinst_PROGRAMS = \ + gst/gstpipeline \ libs/collectpads \ - gst/gstpipeline + elements/queue TESTS = $(check_PROGRAMS) diff --git a/tests/check/elements/queue.c b/tests/check/elements/queue.c index 176f2de..37179a4 100644 --- a/tests/check/elements/queue.c +++ b/tests/check/elements/queue.c @@ -98,11 +98,13 @@ GST_START_TEST (test_non_leaky_underrun) gst_pad_set_active (mysinkpad, TRUE); g_object_set (G_OBJECT (queue), "max-size-buffers", 2, NULL); + GST_DEBUG ("starting"); + fail_unless (gst_element_set_state (queue, GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS, "could not set to playing"); - GST_DEBUG ("running"); + /* FIXME: there seems to be a race here */ g_mutex_lock (check_mutex); g_cond_wait (check_cond, check_mutex); g_mutex_unlock (check_mutex); @@ -139,12 +141,12 @@ GST_START_TEST (test_non_leaky_overrun) gst_pad_set_active (mysrcpad, TRUE); g_object_set (G_OBJECT (queue), "max-size-buffers", 2, NULL); + GST_DEBUG ("starting"); + fail_unless (gst_element_set_state (queue, GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS, "could not set to playing"); - GST_DEBUG ("running"); - buffer1 = gst_buffer_new_and_alloc (4); ASSERT_BUFFER_REFCOUNT (buffer1, "buffer", 1); /* pushing gives away my reference ... */ -- 2.7.4