mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

element: clean up element flags

Browse source 
Clean up the element flags
This commit is contained in:
Wim Taymans 2011-11-28 16:54:55 +01:00
parent 06b08e9877
commit d65773b5fa
6 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gst/gstbin.c
View file

@ -1058,8 +1058,8 @@ gst_bin_add_func (GstBin * bin, GstElement * element)
/* get the element name to make sure it is unique in this bin. */ /* get the element name to make sure it is unique in this bin. */
GST_OBJECT_LOCK (element); GST_OBJECT_LOCK (element);
elem_name = g_strdup (GST_ELEMENT_NAME (element)); elem_name = g_strdup (GST_ELEMENT_NAME (element));
is_sink = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_IS_SINK); is_sink = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_FLAG_SINK);
is_source = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_IS_SOURCE); is_source = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_FLAG_SOURCE);
GST_OBJECT_UNLOCK (element); GST_OBJECT_UNLOCK (element);
GST_OBJECT_LOCK (bin); GST_OBJECT_LOCK (bin);
@ -1080,12 +1080,12 @@ gst_bin_add_func (GstBin * bin, GstElement * element)
if (is_sink) { if (is_sink) {
GST_CAT_DEBUG_OBJECT (GST_CAT_PARENTAGE, bin, "element \"%s\" was sink", GST_CAT_DEBUG_OBJECT (GST_CAT_PARENTAGE, bin, "element \"%s\" was sink",
elem_name); elem_name);
GST_OBJECT_FLAG_SET (bin, GST_ELEMENT_IS_SINK); GST_OBJECT_FLAG_SET (bin, GST_ELEMENT_FLAG_SINK);
} }
if (is_source) { if (is_source) {
GST_CAT_DEBUG_OBJECT (GST_CAT_PARENTAGE, bin, "element \"%s\" was source", GST_CAT_DEBUG_OBJECT (GST_CAT_PARENTAGE, bin, "element \"%s\" was source",
elem_name); elem_name);
GST_OBJECT_FLAG_SET (bin, GST_ELEMENT_IS_SOURCE); GST_OBJECT_FLAG_SET (bin, GST_ELEMENT_FLAG_SOURCE);
} }
if (gst_element_provides_clock (element)) { if (gst_element_provides_clock (element)) {
GST_DEBUG_OBJECT (bin, "element \"%s\" can provide a clock", elem_name); GST_DEBUG_OBJECT (bin, "element \"%s\" can provide a clock", elem_name);
@ -1268,14 +1268,15 @@ gst_bin_remove_func (GstBin * bin, GstElement * element)
GST_OBJECT_LOCK (element); GST_OBJECT_LOCK (element);
/* Check if the element is already being removed and immediately /* Check if the element is already being removed and immediately
* return */ * return */
if (G_UNLIKELY (GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_UNPARENTING))) if (G_UNLIKELY (GST_OBJECT_FLAG_IS_SET (element,
GST_ELEMENT_FLAG_UNPARENTING)))
goto already_removing; goto already_removing;
GST_OBJECT_FLAG_SET (element, GST_ELEMENT_UNPARENTING); GST_OBJECT_FLAG_SET (element, GST_ELEMENT_FLAG_UNPARENTING);
/* grab element name so we can print it */ /* grab element name so we can print it */
elem_name = g_strdup (GST_ELEMENT_NAME (element)); elem_name = g_strdup (GST_ELEMENT_NAME (element));
is_sink = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_IS_SINK); is_sink = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_FLAG_SINK);
is_source = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_IS_SOURCE); is_source = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_FLAG_SOURCE);
GST_OBJECT_UNLOCK (element); GST_OBJECT_UNLOCK (element);
/* unlink all linked pads */ /* unlink all linked pads */
@ -1303,8 +1304,8 @@ gst_bin_remove_func (GstBin * bin, GstElement * element)
gboolean child_sink, child_source; gboolean child_sink, child_source;
GST_OBJECT_LOCK (child); GST_OBJECT_LOCK (child);
child_sink = GST_OBJECT_FLAG_IS_SET (child, GST_ELEMENT_IS_SINK); child_sink = GST_OBJECT_FLAG_IS_SET (child, GST_ELEMENT_FLAG_SINK);
child_source = GST_OBJECT_FLAG_IS_SET (child, GST_ELEMENT_IS_SOURCE); child_source = GST_OBJECT_FLAG_IS_SET (child, GST_ELEMENT_FLAG_SOURCE);
/* when we remove a sink, check if there are other sinks. */ /* when we remove a sink, check if there are other sinks. */
if (is_sink && !othersink && child_sink) if (is_sink && !othersink && child_sink)
othersink = TRUE; othersink = TRUE;
@ -1330,12 +1331,12 @@ gst_bin_remove_func (GstBin * bin, GstElement * element)
if (is_sink && !othersink) { if (is_sink && !othersink) {
/* we're not a sink anymore */ /* we're not a sink anymore */
GST_DEBUG_OBJECT (bin, "we removed the last sink"); GST_DEBUG_OBJECT (bin, "we removed the last sink");
GST_OBJECT_FLAG_UNSET (bin, GST_ELEMENT_IS_SINK); GST_OBJECT_FLAG_UNSET (bin, GST_ELEMENT_FLAG_SINK);
} }
if (is_source && !othersource) { if (is_source && !othersource) {
/* we're not a source anymore */ /* we're not a source anymore */
GST_DEBUG_OBJECT (bin, "we removed the last source"); GST_DEBUG_OBJECT (bin, "we removed the last source");
GST_OBJECT_FLAG_UNSET (bin, GST_ELEMENT_IS_SOURCE); GST_OBJECT_FLAG_UNSET (bin, GST_ELEMENT_FLAG_SOURCE);
} }
@ -1467,7 +1468,7 @@ no_state_recalc:
gst_object_unparent (GST_OBJECT_CAST (element)); gst_object_unparent (GST_OBJECT_CAST (element));
GST_OBJECT_LOCK (element); GST_OBJECT_LOCK (element);
GST_OBJECT_FLAG_UNSET (element, GST_ELEMENT_UNPARENTING); GST_OBJECT_FLAG_UNSET (element, GST_ELEMENT_FLAG_UNPARENTING);
GST_OBJECT_UNLOCK (element); GST_OBJECT_UNLOCK (element);
g_signal_emit (bin, gst_bin_signals[ELEMENT_REMOVED], 0, element); g_signal_emit (bin, gst_bin_signals[ELEMENT_REMOVED], 0, element);
@ -1629,7 +1630,7 @@ bin_element_is_sink (GstElement * child, GstBin * bin)
/* we lock the child here for the remainder of the function to /* we lock the child here for the remainder of the function to
* get its name and flag safely. */ * get its name and flag safely. */
GST_OBJECT_LOCK (child); GST_OBJECT_LOCK (child);
is_sink = GST_OBJECT_FLAG_IS_SET (child, GST_ELEMENT_IS_SINK); is_sink = GST_OBJECT_FLAG_IS_SET (child, GST_ELEMENT_FLAG_SINK);
GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, bin, GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, bin,
"child %s %s sink", GST_OBJECT_NAME (child), is_sink ? "is" : "is not"); "child %s %s sink", GST_OBJECT_NAME (child), is_sink ? "is" : "is not");
@ -1652,7 +1653,7 @@ sink_iterator_filter (const GValue * vchild, GValue * vbin)
* @bin: a #GstBin * @bin: a #GstBin
* *
* Gets an iterator for all elements in the bin that have the * Gets an iterator for all elements in the bin that have the
* #GST_ELEMENT_IS_SINK flag set. * #GST_ELEMENT_FLAG_SINK flag set.
* *
* Each element yielded by the iterator will have its refcount increased, so * Each element yielded by the iterator will have its refcount increased, so
* unref after use. * unref after use.
@ -1692,7 +1693,7 @@ bin_element_is_src (GstElement * child, GstBin * bin)
/* we lock the child here for the remainder of the function to /* we lock the child here for the remainder of the function to
* get its name and other info safely. */ * get its name and other info safely. */
GST_OBJECT_LOCK (child); GST_OBJECT_LOCK (child);
is_src = GST_OBJECT_FLAG_IS_SET (child, GST_ELEMENT_IS_SOURCE); is_src = GST_OBJECT_FLAG_IS_SET (child, GST_ELEMENT_FLAG_SOURCE);
GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, bin, GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, bin,
"child %s %s src", GST_OBJECT_NAME (child), is_src ? "is" : "is not"); "child %s %s src", GST_OBJECT_NAME (child), is_src ? "is" : "is not");
@ -1715,7 +1716,7 @@ src_iterator_filter (const GValue * vchild, GValue * vbin)
* @bin: a #GstBin * @bin: a #GstBin
* *
* Gets an iterator for all elements in the bin that have the * Gets an iterator for all elements in the bin that have the
* #GST_ELEMENT_IS_SOURCE flag set. * #GST_ELEMENT_FLAG_SOURCE flag set.
* *
* Each element yielded by the iterator will have its refcount increased, so * Each element yielded by the iterator will have its refcount increased, so
* unref after use. * unref after use.
@ -1866,7 +1867,7 @@ reset_degree (GstElement * element, GstBinSortIterator * bit)
/* sinks are added right away */ /* sinks are added right away */
GST_OBJECT_LOCK (element); GST_OBJECT_LOCK (element);
is_sink = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_IS_SINK); is_sink = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_FLAG_SINK);
GST_OBJECT_UNLOCK (element); GST_OBJECT_UNLOCK (element);
if (is_sink) { if (is_sink) {
@ -2135,7 +2136,7 @@ gst_bin_element_set_state (GstBin * bin, GstElement * element,
GST_ELEMENT_START_TIME (element) = start_time; GST_ELEMENT_START_TIME (element) = start_time;
element->base_time = base_time; element->base_time = base_time;
/* peel off the locked flag */ /* peel off the locked flag */
locked = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_LOCKED_STATE); locked = GST_ELEMENT_IS_LOCKED_STATE (element);
/* Get the previous set_state result to preserve NO_PREROLL and ASYNC */ /* Get the previous set_state result to preserve NO_PREROLL and ASYNC */
ret = GST_STATE_RETURN (element); ret = GST_STATE_RETURN (element);
child_current = GST_STATE (element); child_current = GST_STATE (element);

10
gst/gstelement.c
View file

@ -1835,7 +1835,7 @@ gst_element_is_locked_state (GstElement * element)
g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE); g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
GST_OBJECT_LOCK (element); GST_OBJECT_LOCK (element);
result = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_LOCKED_STATE); result = GST_ELEMENT_IS_LOCKED_STATE (element);
GST_OBJECT_UNLOCK (element); GST_OBJECT_UNLOCK (element);
return result; return result;
@ -1862,7 +1862,7 @@ gst_element_set_locked_state (GstElement * element, gboolean locked_state)
g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE); g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
GST_OBJECT_LOCK (element); GST_OBJECT_LOCK (element);
old = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_LOCKED_STATE); old = GST_ELEMENT_IS_LOCKED_STATE (element);
if (G_UNLIKELY (old == locked_state)) if (G_UNLIKELY (old == locked_state))
goto was_ok; goto was_ok;
@ -1870,11 +1870,11 @@ gst_element_set_locked_state (GstElement * element, gboolean locked_state)
if (locked_state) { if (locked_state) {
GST_CAT_DEBUG (GST_CAT_STATES, "locking state of element %s", GST_CAT_DEBUG (GST_CAT_STATES, "locking state of element %s",
GST_ELEMENT_NAME (element)); GST_ELEMENT_NAME (element));
GST_OBJECT_FLAG_SET (element, GST_ELEMENT_LOCKED_STATE); GST_OBJECT_FLAG_SET (element, GST_ELEMENT_FLAG_LOCKED_STATE);
} else { } else {
GST_CAT_DEBUG (GST_CAT_STATES, "unlocking state of element %s", GST_CAT_DEBUG (GST_CAT_STATES, "unlocking state of element %s",
GST_ELEMENT_NAME (element)); GST_ELEMENT_NAME (element));
GST_OBJECT_FLAG_UNSET (element, GST_ELEMENT_LOCKED_STATE); GST_OBJECT_FLAG_UNSET (element, GST_ELEMENT_FLAG_LOCKED_STATE);
} }
GST_OBJECT_UNLOCK (element); GST_OBJECT_UNLOCK (element);
@ -2853,7 +2853,7 @@ not_null:
{ {
gboolean is_locked; gboolean is_locked;
is_locked = GST_OBJECT_FLAG_IS_SET (element, GST_ELEMENT_LOCKED_STATE); is_locked = GST_ELEMENT_IS_LOCKED_STATE (element);
g_critical g_critical
("\nTrying to dispose element %s, but it is in %s%s instead of the NULL" ("\nTrying to dispose element %s, but it is in %s%s instead of the NULL"
" state.\n" " state.\n"

20
gst/gstelement.h
View file

@ -315,23 +315,23 @@ typedef enum /*< flags=0 >*/
/** /**
* GstElementFlags: * GstElementFlags:
* @GST_ELEMENT_LOCKED_STATE: ignore state changes from parent * @GST_ELEMENT_FLAG_UNPARENTING: Child is being removed from the parent bin.
* @GST_ELEMENT_IS_SINK: the element is a sink
* @GST_ELEMENT_UNPARENTING: Child is being removed from the parent bin.
* gst_bin_remove() on a child already being removed immediately returns FALSE * gst_bin_remove() on a child already being removed immediately returns FALSE
* @GST_ELEMENT_IS_SOURCE: the element is a source. Since 0.10.31 * @GST_ELEMENT_FLAG_LOCKED_STATE: ignore state changes from parent
* @GST_ELEMENT_FLAG_SINK: the element is a sink
* @GST_ELEMENT_FLAG_SOURCE: the element is a source. Since 0.10.31
* @GST_ELEMENT_FLAG_LAST: offset to define more flags * @GST_ELEMENT_FLAG_LAST: offset to define more flags
* *
* The standard flags that an element may have. * The standard flags that an element may have.
*/ */
typedef enum typedef enum
{ {
GST_ELEMENT_LOCKED_STATE = (GST_OBJECT_FLAG_LAST << 0), GST_ELEMENT_FLAG_UNPARENTING = (GST_OBJECT_FLAG_LAST << 0),
GST_ELEMENT_IS_SINK = (GST_OBJECT_FLAG_LAST << 1), GST_ELEMENT_FLAG_LOCKED_STATE = (GST_OBJECT_FLAG_LAST << 1),
GST_ELEMENT_UNPARENTING = (GST_OBJECT_FLAG_LAST << 2), GST_ELEMENT_FLAG_SINK = (GST_OBJECT_FLAG_LAST << 2),
GST_ELEMENT_IS_SOURCE = (GST_OBJECT_FLAG_LAST << 3), GST_ELEMENT_FLAG_SOURCE = (GST_OBJECT_FLAG_LAST << 3),
/* padding */ /* padding */
GST_ELEMENT_FLAG_LAST = (GST_OBJECT_FLAG_LAST << 16) GST_ELEMENT_FLAG_LAST = (GST_OBJECT_FLAG_LAST << 16)
} GstElementFlags; } GstElementFlags;
/** /**
@ -341,7 +341,7 @@ typedef enum
* Check if the element is in the locked state and therefore will ignore state * Check if the element is in the locked state and therefore will ignore state
* changes from its parent object. * changes from its parent object.
*/ */
#define GST_ELEMENT_IS_LOCKED_STATE(elem) (GST_OBJECT_FLAG_IS_SET(elem,GST_ELEMENT_LOCKED_STATE)) #define GST_ELEMENT_IS_LOCKED_STATE(elem) (GST_OBJECT_FLAG_IS_SET(elem,GST_ELEMENT_FLAG_LOCKED_STATE))
/** /**
* GST_ELEMENT_NAME: * GST_ELEMENT_NAME:

2
libs/gst/base/gstbasesink.c
View file

@ -668,7 +668,7 @@ gst_base_sink_init (GstBaseSink * basesink, gpointer g_class)
g_atomic_int_set (&priv->enable_last_buffer, DEFAULT_ENABLE_LAST_BUFFER); g_atomic_int_set (&priv->enable_last_buffer, DEFAULT_ENABLE_LAST_BUFFER);
priv->throttle_time = DEFAULT_THROTTLE_TIME; priv->throttle_time = DEFAULT_THROTTLE_TIME;
GST_OBJECT_FLAG_SET (basesink, GST_ELEMENT_IS_SINK); GST_OBJECT_FLAG_SET (basesink, GST_ELEMENT_FLAG_SINK);
} }
static void static void

2
libs/gst/base/gstbasesrc.c
View file

@ -432,7 +432,7 @@ gst_base_src_init (GstBaseSrc * basesrc, gpointer g_class)
g_atomic_int_set (&basesrc->priv->have_events, FALSE); g_atomic_int_set (&basesrc->priv->have_events, FALSE);
GST_OBJECT_FLAG_UNSET (basesrc, GST_BASE_SRC_STARTED); GST_OBJECT_FLAG_UNSET (basesrc, GST_BASE_SRC_STARTED);
GST_OBJECT_FLAG_SET (basesrc, GST_ELEMENT_IS_SOURCE); GST_OBJECT_FLAG_SET (basesrc, GST_ELEMENT_FLAG_SOURCE);
GST_DEBUG_OBJECT (basesrc, "init done"); GST_DEBUG_OBJECT (basesrc, "init done");
} }

2
tests/check/gst/gstbin.c
View file

@ -711,7 +711,7 @@ GST_START_TEST (test_children_state_change_order_semi_sink)
fail_unless (gst_element_link (identity, sink) == TRUE); fail_unless (gst_element_link (identity, sink) == TRUE);
/* this is not very nice but should work just fine in this case. */ /* this is not very nice but should work just fine in this case. */
GST_OBJECT_FLAG_UNSET (sink, GST_ELEMENT_IS_SINK); /* <======== */ GST_OBJECT_FLAG_UNSET (sink, GST_ELEMENT_FLAG_SINK); /* <======== */
ret = gst_element_set_state (pipeline, GST_STATE_PLAYING); ret = gst_element_set_state (pipeline, GST_STATE_PLAYING);
fail_if (ret != GST_STATE_CHANGE_ASYNC, "State change to PLAYING not ASYNC"); fail_if (ret != GST_STATE_CHANGE_ASYNC, "State change to PLAYING not ASYNC");