mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 03:29:50 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	gst/gstpad.c
This commit is contained in:
Wim Taymans 2011-10-08 09:28:02 +02:00
commit ee1f861ec1
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/gstinfo.c
View file

@ -629,6 +629,23 @@ gst_debug_print_object (gpointer ptr)
if (*(GType *) ptr == GST_TYPE_STRUCTURE) {
return gst_info_structure_to_string ((const GstStructure *) ptr);
}
if (GST_IS_BUFFER (ptr)) {
GstBuffer *buf = (GstBuffer *) ptr;
gchar *caps, *ret;
caps = gst_caps_to_string (GST_BUFFER_CAPS (buf));
ret =
g_strdup_printf ("%p, data %p, malloc %p, ts %" GST_TIME_FORMAT
", dur %" GST_TIME_FORMAT ", size %u, offset %" G_GUINT64_FORMAT
", offset_end %" G_GUINT64_FORMAT ", caps: %s", buf,
GST_BUFFER_DATA (buf), GST_BUFFER_MALLOCDATA (buf),
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)),
GST_TIME_ARGS (GST_BUFFER_DURATION (buf)), GST_BUFFER_SIZE (buf),
GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET_END (buf), caps);
g_free (caps);
return ret;
}
#ifdef USE_POISONING
if (*(guint32 *) ptr == 0xffffffff) {
return g_strdup_printf ("<poisoned@%p>", ptr);

5
gst/gstpad.c
View file

@ -3598,9 +3598,8 @@ gst_pad_chain_data_unchecked (GstPad * pad, GstProbeType type, void *data)
goto no_function;
GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad,
"calling chainfunction &%s with buffer %p, ts %" GST_TIME_FORMAT,
GST_DEBUG_FUNCPTR_NAME (chainfunc),
GST_BUFFER (data), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (data)));
"calling chainfunction &%s with buffer %" GST_PTR_FORMAT,
GST_DEBUG_FUNCPTR_NAME (chainfunc), GST_BUFFER (data));
ret = chainfunc (pad, GST_BUFFER_CAST (data));