mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	gst/gstevent.h
This commit is contained in:
Wim Taymans 2011-10-16 14:20:33 +02:00
commit 40bb69827c
5 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/gstbin.c
View file

@ -2567,12 +2567,12 @@ restart:
break;
}
case GST_ITERATOR_RESYNC:
GST_CAT_DEBUG (GST_CAT_STATES, "iterator doing resync");
GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element, "iterator doing resync");
gst_iterator_resync (it);
goto restart;
default:
case GST_ITERATOR_DONE:
GST_CAT_DEBUG (GST_CAT_STATES, "iterator done");
GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element, "iterator done");
done = TRUE;
break;
}
@ -2583,12 +2583,13 @@ restart:
goto done;
if (have_no_preroll) {
GST_CAT_DEBUG (GST_CAT_STATES,
GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, bin,
"we have NO_PREROLL elements %s -> NO_PREROLL",
gst_element_state_change_return_get_name (ret));
ret = GST_STATE_CHANGE_NO_PREROLL;
} else if (have_async) {
GST_CAT_DEBUG (GST_CAT_STATES, "we have ASYNC elements %s -> ASYNC",
GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, bin,
"we have ASYNC elements %s -> ASYNC",
gst_element_state_change_return_get_name (ret));
ret = GST_STATE_CHANGE_ASYNC;
}

15
gst/gstbuffer.h
View file

@ -441,12 +441,15 @@ void gst_buffer_copy_into (GstBuffer *dest, GstBuffer *src
*
* Either @nbuf or the #GstBuffer pointed to by @obuf may be NULL.
*/
#define gst_buffer_replace(obuf,nbuf) \
G_STMT_START { \
GstBuffer **___obufaddr = (GstBuffer **)(obuf); \
gst_mini_object_replace ((GstMiniObject **)___obufaddr, \
GST_MINI_OBJECT_CAST (nbuf)); \
} G_STMT_END
#ifdef _FOOL_GTK_DOC_
G_INLINE_FUNC void gst_buffer_replace (GstBuffer **obuf, GstBuffer *nbuf);
#endif
static inline void
gst_buffer_replace (GstBuffer **obuf, GstBuffer *nbuf)
{
gst_mini_object_replace ((GstMiniObject **) obuf, (GstMiniObject *) nbuf);
}
/* creating a region */
GstBuffer* gst_buffer_copy_region (GstBuffer *parent, GstBufferCopyFlags flags,

4
gst/gstbus.c
View file

@ -1194,8 +1194,8 @@ gst_bus_disable_sync_message_emission (GstBus * bus)
* responsible for calling gst_bus_remove_signal_watch() as many times as this
* function is called.
*
* There can only be a single bus watch per bus, you most remove all signal watch
* before you can set another type of watch.
* There can only be a single bus watch per bus, you must remove any signal
* watch before you can set another type of watch.
*
* MT safe.
*/

4
gst/gstdebugutils.c
View file

@ -81,7 +81,9 @@ debug_dump_get_element_state (GstElement * element)
gst_element_get_state (element, &state, &pending, 0);
if (pending == GST_STATE_VOID_PENDING) {
state_name = g_strdup_printf ("\\n[%c]", state_icons[state]);
gboolean is_locked = gst_element_is_locked_state (element);
state_name = g_strdup_printf ("\\n[%c]%s", state_icons[state],
(is_locked ? "(locked)" : ""));
} else {
state_name = g_strdup_printf ("\\n[%c] -> [%c]", state_icons[state],
state_icons[pending]);

12
gst/gstevent.h
View file

@ -281,8 +281,16 @@ extern GType _gst_event_type;
*
* Returns: TRUE if @new_event was different from @old_event
*/
#define gst_event_replace(old_event,new_event) \
gst_mini_object_replace ((GstMiniObject **)(old_event), GST_MINI_OBJECT_CAST (new_event))
#ifdef _FOOL_GTK_DOC_
G_INLINE_FUNC void gst_event_replace (GstEvent **old_event, GstEvent *new_event);
#endif
static inline void
gst_event_replace (GstEvent **old_event, GstEvent *new_event)
{
gst_mini_object_replace ((GstMiniObject **) old_event, (GstMiniObject *) new_event);
}
/**
* gst_event_steal:
* @old_event: (inout) (transfer full): pointer to a pointer to a #GstEvent