From 4febebb9628caee41e4a56f2e46383b143421f94 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 8 Jan 2016 19:25:24 +0000 Subject: [PATCH] info: add buffer list support to GST_PTR_FORMAT --- gst/gstinfo.c | 28 ++++++++++++++++++++++++++++ tests/check/gst/gstinfo.c | 18 ++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/gst/gstinfo.c b/gst/gstinfo.c index aebd62b..49b3696 100644 --- a/gst/gstinfo.c +++ b/gst/gstinfo.c @@ -608,6 +608,31 @@ gst_info_describe_buffer (GstBuffer * buffer) } static inline gchar * +gst_info_describe_buffer_list (GstBufferList * list) +{ + GstClockTime pts = GST_CLOCK_TIME_NONE; + GstClockTime dts = GST_CLOCK_TIME_NONE; + gsize total_size = 0; + guint n, i; + + n = gst_buffer_list_length (list); + for (i = 0; i < n; ++i) { + GstBuffer *buf = gst_buffer_list_get (list, i); + + if (i == 0) { + pts = GST_BUFFER_PTS (buf); + dts = GST_BUFFER_DTS (buf); + } + + total_size += gst_buffer_get_size (buf); + } + + return g_strdup_printf ("bufferlist: %p, %u buffers, pts %" GST_TIME_FORMAT + ", dts %" GST_TIME_FORMAT ", size %" G_GSIZE_FORMAT, list, n, + GST_TIME_ARGS (pts), GST_TIME_ARGS (dts), total_size); +} + +static inline gchar * gst_info_describe_event (GstEvent * event) { gchar *s, *ret; @@ -693,6 +718,9 @@ gst_debug_print_object (gpointer ptr) if (GST_IS_BUFFER (ptr)) { return gst_info_describe_buffer (GST_BUFFER_CAST (ptr)); } + if (GST_IS_BUFFER_LIST (ptr)) { + return gst_info_describe_buffer_list (GST_BUFFER_LIST_CAST (ptr)); + } #ifdef USE_POISONING if (*(guint32 *) ptr == 0xffffffff) { return g_strdup_printf ("", ptr); diff --git a/tests/check/gst/gstinfo.c b/tests/check/gst/gstinfo.c index f808d8e..e5091fa 100644 --- a/tests/check/gst/gstinfo.c +++ b/tests/check/gst/gstinfo.c @@ -89,6 +89,24 @@ GST_START_TEST (info_ptr_format_printf_extension) gst_message_unref (msg); } + /* buffer and buffer list */ + { + GstBufferList *list; + GstBuffer *buf; + + buf = gst_buffer_new_allocate (NULL, 42, NULL); + GST_BUFFER_PTS (buf) = 5 * GST_SECOND; + GST_BUFFER_DURATION (buf) = GST_SECOND; + GST_LOG ("BUFFER: %" GST_PTR_FORMAT, buf); + + list = gst_buffer_list_new (); + gst_buffer_list_add (list, buf); + buf = gst_buffer_new_allocate (NULL, 58, NULL); + gst_buffer_list_add (list, buf); + GST_LOG ("BUFFERLIST: %" GST_PTR_FORMAT, list); + gst_buffer_list_unref (list); + } + #if 0 /* TODO: GObject */ { -- 2.7.4