/**
* SECTION:gstadapter
+ * @title: GstAdapter
* @short_description: adapts incoming data on a sink pad into chunks of N bytes
*
* This class is for elements that receive buffers in an undesired size.
* (#GST_BUFFER_OFFSET) that were pushed. The last seen offset before the
* current position can be queried with gst_adapter_prev_offset(). This function
* can optionally return the number of bytes between the start of the buffer
- * that carried the offset and the current adapter position. If the meaning of
- * #GST_BUFFER_OFFSET for the stream being handled corresponds to bytes, then
- * the accumulated offset since the last #GST_BUFFER_FLAG_DISCONT buffer can be
- * queried with gst_adapter_get_offset_from_discont(). This is useful for
- * elements that want to track the position of data in the stream based on the
- * offset of the incoming buffers.
+ * that carried the offset and the current adapter position.
+ *
+ * Additionally the adapter also keeps track of the PTS, DTS and buffer offset
+ * at the last discontinuity, which can be retrieved with
+ * gst_adapter_pts_at_discont(), gst_adapter_dts_at_discont() and
+ * gst_adapter_offset_at_discont(). The number of bytes that were consumed
+ * since then can be queried with gst_adapter_distance_from_discont().
*
* A last thing to note is that while #GstAdapter is pretty optimized,
* merging buffers still might be an operation that requires a malloc() and
#include <gst/gst_private.h>
#include "gstadapter.h"
#include <string.h>
+#include <gst/base/gstqueuearray.h>
/* default size for the assembled data buffer */
#define DEFAULT_SIZE 4096
-#define INCREASE_OFFSET(a, offs) if ((a)->offset_discont != GST_BUFFER_OFFSET_NONE) { (a)->offset_discont += (offs); }
-
static void gst_adapter_flush_unchecked (GstAdapter * adapter, gsize flush);
GST_DEBUG_CATEGORY_STATIC (gst_adapter_debug);
GObject object;
/*< private > */
- GSList *buflist;
- GSList *buflist_end;
+ GstQueueArray *bufqueue;
gsize size;
gsize skip;
guint count;
guint64 offset_distance;
gsize scan_offset;
- GSList *scan_entry;
+ /* G_MAXUINT when unset */
+ guint scan_entry_idx;
+
+ GstClockTime pts_at_discont;
+ GstClockTime dts_at_discont;
+ guint64 offset_at_discont;
- guint64 offset_discont;
+ guint64 distance_from_discont;
GstMapInfo info;
};
adapter->dts_distance = 0;
adapter->offset = GST_BUFFER_OFFSET_NONE;
adapter->offset_distance = 0;
- adapter->offset_discont = GST_BUFFER_OFFSET_NONE;
+ adapter->pts_at_discont = GST_CLOCK_TIME_NONE;
+ adapter->dts_at_discont = GST_CLOCK_TIME_NONE;
+ adapter->offset_at_discont = GST_BUFFER_OFFSET_NONE;
+ adapter->distance_from_discont = 0;
+ adapter->bufqueue = gst_queue_array_new (10);
}
static void
g_free (adapter->assembled_data);
+ gst_queue_array_free (adapter->bufqueue);
+
GST_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
}
GstAdapter *
gst_adapter_new (void)
{
- return g_object_newv (GST_TYPE_ADAPTER, 0, NULL);
+ return g_object_new (GST_TYPE_ADAPTER, NULL);
}
/**
void
gst_adapter_clear (GstAdapter * adapter)
{
+ GstMiniObject *obj;
g_return_if_fail (GST_IS_ADAPTER (adapter));
if (adapter->info.memory)
gst_adapter_unmap (adapter);
- g_slist_foreach (adapter->buflist, (GFunc) gst_mini_object_unref, NULL);
- g_slist_free (adapter->buflist);
- adapter->buflist = NULL;
- adapter->buflist_end = NULL;
+ while ((obj = gst_queue_array_pop_head (adapter->bufqueue)))
+ gst_mini_object_unref (obj);
+
adapter->count = 0;
adapter->size = 0;
adapter->skip = 0;
adapter->dts_distance = 0;
adapter->offset = GST_BUFFER_OFFSET_NONE;
adapter->offset_distance = 0;
+ adapter->pts_at_discont = GST_CLOCK_TIME_NONE;
+ adapter->dts_at_discont = GST_CLOCK_TIME_NONE;
+ adapter->offset_at_discont = GST_BUFFER_OFFSET_NONE;
+ adapter->distance_from_discont = 0;
adapter->scan_offset = 0;
- adapter->scan_entry = NULL;
- adapter->offset_discont = GST_BUFFER_OFFSET_NONE;
+ adapter->scan_entry_idx = G_MAXUINT;
}
static inline void
adapter->dts_distance = 0;
}
offset = GST_BUFFER_OFFSET (buf);
- if (GST_BUFFER_IS_DISCONT (buf)) {
- /* Take offset as-is (might be NONE) */
- adapter->offset_discont = offset;
- GST_LOG_OBJECT (adapter, "offset discont now %" G_GUINT64_FORMAT,
- adapter->offset_discont);
- }
if (offset != GST_BUFFER_OFFSET_NONE) {
GST_LOG_OBJECT (adapter, "new offset %" G_GUINT64_FORMAT, offset);
adapter->offset = offset;
adapter->offset_distance = 0;
}
+
+ if (GST_BUFFER_IS_DISCONT (buf)) {
+ /* Take values as-is (might be NONE) */
+ adapter->pts_at_discont = pts;
+ adapter->dts_at_discont = dts;
+ adapter->offset_at_discont = offset;
+ adapter->distance_from_discont = 0;
+ }
}
/* copy data into @dest, skipping @skip bytes from the head buffers */
copy_into_unchecked (GstAdapter * adapter, guint8 * dest, gsize skip,
gsize size)
{
- GSList *g;
GstBuffer *buf;
gsize bsize, csize;
+ guint idx = 0;
/* first step, do skipping */
/* we might well be copying where we were scanning */
- if (adapter->scan_entry && (adapter->scan_offset <= skip)) {
- g = adapter->scan_entry;
+ if (adapter->scan_entry_idx != G_MAXUINT && (adapter->scan_offset <= skip)) {
+ idx = adapter->scan_entry_idx;
skip -= adapter->scan_offset;
} else {
- g = adapter->buflist;
+ idx = 0;
}
- buf = g->data;
+ buf = gst_queue_array_peek_nth (adapter->bufqueue, idx++);
bsize = gst_buffer_get_size (buf);
while (G_UNLIKELY (skip >= bsize)) {
skip -= bsize;
- g = g_slist_next (g);
- buf = g->data;
+ buf = gst_queue_array_peek_nth (adapter->bufqueue, idx++);
bsize = gst_buffer_get_size (buf);
}
/* copy partial buffer */
/* second step, copy remainder */
while (size > 0) {
- g = g_slist_next (g);
- buf = g->data;
+ buf = gst_queue_array_peek_nth (adapter->bufqueue, idx++);
bsize = gst_buffer_get_size (buf);
if (G_LIKELY (bsize > 0)) {
csize = MIN (bsize, size);
adapter->size += size;
/* Note: merging buffers at this point is premature. */
- if (G_UNLIKELY (adapter->buflist == NULL)) {
+ if (gst_queue_array_is_empty (adapter->bufqueue)) {
GST_LOG_OBJECT (adapter, "pushing %p first %" G_GSIZE_FORMAT " bytes",
buf, size);
- adapter->buflist = adapter->buflist_end = g_slist_append (NULL, buf);
+ gst_queue_array_push_tail (adapter->bufqueue, buf);
update_timestamps_and_offset (adapter, buf);
} else {
/* Otherwise append to the end, and advance our end pointer */
GST_LOG_OBJECT (adapter, "pushing %p %" G_GSIZE_FORMAT " bytes at end, "
"size now %" G_GSIZE_FORMAT, buf, size, adapter->size);
- adapter->buflist_end = g_slist_append (adapter->buflist_end, buf);
- adapter->buflist_end = g_slist_next (adapter->buflist_end);
+ gst_queue_array_push_tail (adapter->bufqueue, buf);
}
++adapter->count;
}
#if 0
do {
#endif
- cur = adapter->buflist->data;
+ cur = gst_queue_array_peek_head (adapter->bufqueue);
skip = adapter->skip;
csize = gst_buffer_get_size (cur);
g_return_if_fail (GST_IS_ADAPTER (adapter));
if (adapter->info.memory) {
- GstBuffer *cur = adapter->buflist->data;
+ GstBuffer *cur = gst_queue_array_peek_head (adapter->bufqueue);
GST_LOG_OBJECT (adapter, "unmap memory buffer %p", cur);
gst_buffer_unmap (cur, &adapter->info);
adapter->info.memory = NULL;
{
GstBuffer *cur;
gsize size;
- GSList *g;
GST_LOG_OBJECT (adapter, "flushing %" G_GSIZE_FORMAT " bytes", flush);
adapter->pts_distance -= adapter->skip;
adapter->dts_distance -= adapter->skip;
adapter->offset_distance -= adapter->skip;
- INCREASE_OFFSET (adapter, -adapter->skip);
+ adapter->distance_from_discont -= adapter->skip;
- g = adapter->buflist;
- cur = g->data;
+ cur = gst_queue_array_peek_head (adapter->bufqueue);
size = gst_buffer_get_size (cur);
while (flush >= size) {
/* can skip whole buffer */
adapter->pts_distance += size;
adapter->dts_distance += size;
adapter->offset_distance += size;
+ adapter->distance_from_discont += size;
flush -= size;
- INCREASE_OFFSET (adapter, size);
- gst_buffer_unref (cur);
- g = g_slist_delete_link (g, g);
--adapter->count;
- if (G_UNLIKELY (g == NULL)) {
+ cur = NULL;
+ gst_buffer_unref (gst_queue_array_pop_head (adapter->bufqueue));
+
+ if (gst_queue_array_is_empty (adapter->bufqueue)) {
GST_LOG_OBJECT (adapter, "adapter empty now");
- adapter->buflist_end = NULL;
break;
}
/* there is a new head buffer, update the timestamps */
- cur = g->data;
+ cur = gst_queue_array_peek_head (adapter->bufqueue);
update_timestamps_and_offset (adapter, cur);
size = gst_buffer_get_size (cur);
}
- adapter->buflist = g;
/* account for the remaining bytes */
adapter->skip = flush;
adapter->pts_distance += flush;
adapter->dts_distance += flush;
adapter->offset_distance += flush;
- INCREASE_OFFSET (adapter, flush);
+ adapter->distance_from_discont += flush;
/* invalidate scan position */
adapter->scan_offset = 0;
- adapter->scan_entry = NULL;
+ adapter->scan_entry_idx = G_MAXUINT;
}
/**
{
GstBuffer *buffer = NULL;
GstBuffer *cur;
- GSList *item;
gsize skip;
gsize left = nbytes;
+ guint idx, len;
g_return_val_if_fail (GST_IS_ADAPTER (adapter), NULL);
g_return_val_if_fail (nbytes > 0, NULL);
return NULL;
skip = adapter->skip;
- cur = adapter->buflist->data;
+ cur = gst_queue_array_peek_head (adapter->bufqueue);
if (skip == 0 && gst_buffer_get_size (cur) == nbytes) {
GST_LOG_OBJECT (adapter, "providing buffer of %" G_GSIZE_FORMAT " bytes"
goto done;
}
- for (item = adapter->buflist; item && left > 0; item = item->next) {
+ len = gst_queue_array_get_length (adapter->bufqueue);
+
+ for (idx = 0; idx < len && left > 0; idx++) {
gsize size, cur_size;
- cur = item->data;
+ cur = gst_queue_array_peek_nth (adapter->bufqueue, idx);
cur_size = gst_buffer_get_size (cur);
size = MIN (cur_size - skip, left);
GST_DEBUG ("copying metadata %s", g_type_name (info->api));
}
- if (do_copy) {
+ if (do_copy && info->transform_func) {
GstMetaTransformCopy copy_data = { FALSE, 0, -1 };
GST_DEBUG ("copy metadata %s", g_type_name (info->api));
/* simply copy then */
if (G_UNLIKELY (nbytes > adapter->size))
return NULL;
- cur = adapter->buflist->data;
+ cur = gst_queue_array_peek_head (adapter->bufqueue);
skip = adapter->skip;
hsize = gst_buffer_get_size (cur);
buffer = gst_buffer_new_wrapped (data, nbytes);
{
- GSList *g;
+ guint idx, len;
GstBuffer *cur;
gsize read_offset = 0;
- g = adapter->buflist;
- while (g && read_offset < nbytes + adapter->skip) {
- cur = g->data;
+ idx = 0;
+ len = gst_queue_array_get_length (adapter->bufqueue);
+
+ while (idx < len && read_offset < nbytes + adapter->skip) {
+ cur = gst_queue_array_peek_nth (adapter->bufqueue, idx);
gst_buffer_foreach_meta (cur, foreach_metadata, buffer);
read_offset += gst_buffer_get_size (cur);
- g = g_slist_next (g);
+ idx++;
}
}
GST_LOG_OBJECT (adapter, "taking %" G_GSIZE_FORMAT " bytes", nbytes);
while (nbytes > 0) {
- cur = adapter->buflist->data;
+ cur = gst_queue_array_peek_head (adapter->bufqueue);
skip = adapter->skip;
cur_size = gst_buffer_get_size (cur);
hsize = MIN (nbytes, cur_size - skip);
GQueue queue = G_QUEUE_INIT;
GstBuffer *cur, *buffer;
gsize hsize, skip, cur_size;
- GSList *g = NULL;
+ guint idx;
g_return_val_if_fail (GST_IS_ADAPTER (adapter), NULL);
g_return_val_if_fail (nbytes <= adapter->size, NULL);
GST_LOG_OBJECT (adapter, "getting %" G_GSIZE_FORMAT " bytes", nbytes);
- g = adapter->buflist;
+ idx = 0;
skip = adapter->skip;
while (nbytes > 0) {
- cur = g->data;
+ cur = gst_queue_array_peek_nth (adapter->bufqueue, idx++);
cur_size = gst_buffer_get_size (cur);
hsize = MIN (nbytes, cur_size - skip);
nbytes -= hsize;
skip = 0;
- g = g_slist_next (g);
}
return queue.head;
buffer_list = gst_buffer_list_new_sized (n_bufs);
while (nbytes > 0) {
- cur = adapter->buflist->data;
+ cur = gst_queue_array_peek_head (adapter->bufqueue);
skip = adapter->skip;
cur_size = gst_buffer_get_size (cur);
hsize = MIN (nbytes, cur_size - skip);
GstBuffer *cur, *buffer;
gsize hsize, skip, cur_size;
guint n_bufs;
- GSList *g = NULL;
+ guint idx;
g_return_val_if_fail (GST_IS_ADAPTER (adapter), NULL);
buffer_list = gst_buffer_list_new_sized (n_bufs);
- g = adapter->buflist;
+ idx = 0;
skip = adapter->skip;
while (nbytes > 0) {
- cur = g->data;
+ cur = gst_queue_array_peek_nth (adapter->bufqueue, idx++);
cur_size = gst_buffer_get_size (cur);
hsize = MIN (nbytes, cur_size - skip);
nbytes -= hsize;
skip = 0;
- g = g_slist_next (g);
}
return buffer_list;
{
GstBuffer *cur;
gsize size;
- GSList *g;
+ guint idx;
g_return_val_if_fail (GST_IS_ADAPTER (adapter), 0);
return adapter->assembled_len;
/* take the first non-zero buffer */
- g = adapter->buflist;
+ idx = 0;
while (TRUE) {
- cur = g->data;
+ cur = gst_queue_array_peek_nth (adapter->bufqueue, idx++);
size = gst_buffer_get_size (cur);
if (size != 0)
break;
- g = g_slist_next (g);
}
/* we can quickly get the (remaining) data of the first buffer */
}
/**
- * gst_adapter_get_offset_from_discont:
+ * gst_adapter_get_distance_from_discont:
* @adapter: a #GstAdapter
*
- * Get the offset of the adapter based on the incoming buffer offset. Will only
- * return valid values if the incoming buffers have valid offsets set on them.
+ * Get the distance in bytes since the last buffer with the
+ * %GST_BUFFER_FLAG_DISCONT flag.
*
- * The offset will be initially recorded for all buffers with
- * %GST_BUFFER_FLAG_DISCONT on them, and then calculated for all other following
- * buffers based on their size.
+ * The distance will be reset to 0 for all buffers with
+ * %GST_BUFFER_FLAG_DISCONT on them, and then calculated for all other
+ * following buffers based on their size.
*
* Since: 1.10
*
* Returns: The offset. Can be %GST_BUFFER_OFFSET_NONE.
*/
guint64
-gst_adapter_get_offset_from_discont (GstAdapter * adapter)
+gst_adapter_distance_from_discont (GstAdapter * adapter)
+{
+ return adapter->distance_from_discont;
+}
+
+/**
+ * gst_adapter_offset_at_discont:
+ * @adapter: a #GstAdapter
+ *
+ * Get the offset that was on the last buffer with the GST_BUFFER_FLAG_DISCONT
+ * flag, or GST_BUFFER_OFFSET_NONE.
+ *
+ * Since: 1.10
+ *
+ * Returns: The offset at the last discont or GST_BUFFER_OFFSET_NONE.
+ */
+guint64
+gst_adapter_offset_at_discont (GstAdapter * adapter)
{
- return adapter->offset_discont;
+ g_return_val_if_fail (GST_IS_ADAPTER (adapter), GST_BUFFER_OFFSET_NONE);
+
+ return adapter->offset_at_discont;
+}
+
+/**
+ * gst_adapter_pts_at_discont:
+ * @adapter: a #GstAdapter
+ *
+ * Get the PTS that was on the last buffer with the GST_BUFFER_FLAG_DISCONT
+ * flag, or GST_CLOCK_TIME_NONE.
+ *
+ * Since: 1.10
+ *
+ * Returns: The PTS at the last discont or GST_CLOCK_TIME_NONE.
+ */
+GstClockTime
+gst_adapter_pts_at_discont (GstAdapter * adapter)
+{
+ g_return_val_if_fail (GST_IS_ADAPTER (adapter), GST_CLOCK_TIME_NONE);
+
+ return adapter->pts_at_discont;
+}
+
+/**
+ * gst_adapter_dts_at_discont:
+ * @adapter: a #GstAdapter
+ *
+ * Get the DTS that was on the last buffer with the GST_BUFFER_FLAG_DISCONT
+ * flag, or GST_CLOCK_TIME_NONE.
+ *
+ * Since: 1.10
+ *
+ * Returns: The DTS at the last discont or GST_CLOCK_TIME_NONE.
+ */
+GstClockTime
+gst_adapter_dts_at_discont (GstAdapter * adapter)
+{
+ g_return_val_if_fail (GST_IS_ADAPTER (adapter), GST_CLOCK_TIME_NONE);
+
+ return adapter->dts_at_discont;
}
/**
*distance = adapter->offset_distance;
return adapter->offset;
-
}
/**
guint64 * distance)
{
GstBuffer *cur;
- GSList *g;
gsize read_offset = 0;
+ gsize pts_offset = 0;
GstClockTime pts = adapter->pts;
+ guint idx, len;
g_return_val_if_fail (GST_IS_ADAPTER (adapter), GST_CLOCK_TIME_NONE);
- g = adapter->buflist;
+ idx = 0;
+ len = gst_queue_array_get_length (adapter->bufqueue);
- while (g && read_offset < offset + adapter->skip) {
- cur = g->data;
+ while (idx < len && read_offset < offset + adapter->skip) {
+ cur = gst_queue_array_peek_nth (adapter->bufqueue, idx++);
- read_offset += gst_buffer_get_size (cur);
if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (cur))) {
pts = GST_BUFFER_PTS (cur);
+ pts_offset = read_offset;
}
- g = g_slist_next (g);
+ read_offset += gst_buffer_get_size (cur);
}
if (distance)
- *distance = adapter->dts_distance + offset;
+ *distance = adapter->pts_distance + offset - pts_offset;
return pts;
}
guint64 * distance)
{
GstBuffer *cur;
- GSList *g;
gsize read_offset = 0;
+ gsize dts_offset = 0;
GstClockTime dts = adapter->dts;
+ guint idx, len;
g_return_val_if_fail (GST_IS_ADAPTER (adapter), GST_CLOCK_TIME_NONE);
- g = adapter->buflist;
+ idx = 0;
+ len = gst_queue_array_get_length (adapter->bufqueue);
- while (g && read_offset < offset + adapter->skip) {
- cur = g->data;
+ while (idx < len && read_offset < offset + adapter->skip) {
+ cur = gst_queue_array_peek_nth (adapter->bufqueue, idx++);
- read_offset += gst_buffer_get_size (cur);
if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DTS (cur))) {
dts = GST_BUFFER_DTS (cur);
+ dts_offset = read_offset;
}
- g = g_slist_next (g);
+ read_offset += gst_buffer_get_size (cur);
}
if (distance)
- *distance = adapter->dts_distance + offset;
+ *distance = adapter->dts_distance + offset - dts_offset;
return dts;
}
gst_adapter_masked_scan_uint32_peek (GstAdapter * adapter, guint32 mask,
guint32 pattern, gsize offset, gsize size, guint32 * value)
{
- GSList *g;
gsize skip, bsize, i;
guint32 state;
GstMapInfo info;
guint8 *bdata;
GstBuffer *buf;
+ guint idx;
g_return_val_if_fail (size > 0, -1);
g_return_val_if_fail (offset + size <= adapter->size, -1);
/* first step, do skipping and position on the first buffer */
/* optimistically assume scanning continues sequentially */
- if (adapter->scan_entry && (adapter->scan_offset <= skip)) {
- g = adapter->scan_entry;
+ if (adapter->scan_entry_idx != G_MAXUINT && (adapter->scan_offset <= skip)) {
+ idx = adapter->scan_entry_idx;
skip -= adapter->scan_offset;
} else {
- g = adapter->buflist;
+ idx = 0;
adapter->scan_offset = 0;
- adapter->scan_entry = NULL;
+ adapter->scan_entry_idx = G_MAXUINT;
}
- buf = g->data;
+ buf = gst_queue_array_peek_nth (adapter->bufqueue, idx++);
bsize = gst_buffer_get_size (buf);
while (G_UNLIKELY (skip >= bsize)) {
skip -= bsize;
- g = g_slist_next (g);
adapter->scan_offset += bsize;
- adapter->scan_entry = g;
- buf = g->data;
+ adapter->scan_entry_idx = idx;
+ buf = gst_queue_array_peek_nth (adapter->bufqueue, idx++);
bsize = gst_buffer_get_size (buf);
}
/* get the data now */
/* nothing found yet, go to next buffer */
skip += bsize;
- g = g_slist_next (g);
adapter->scan_offset += info.size;
- adapter->scan_entry = g;
+ adapter->scan_entry_idx = idx;
gst_buffer_unmap (buf, &info);
- buf = g->data;
+ buf = gst_queue_array_peek_nth (adapter->bufqueue, idx++);
if (!gst_buffer_map (buf, &info, GST_MAP_READ))
return -1;
* Returns: offset of the first match, or -1 if no match was found.
*
* Example:
- * <programlisting>
+ * |[
* // Assume the adapter contains 0x00 0x01 0x02 ... 0xfe 0xff
*
* gst_adapter_masked_scan_uint32 (adapter, 0xffffffff, 0x00010203, 0, 256);
* // -> returns 2
* gst_adapter_masked_scan_uint32 (adapter, 0xffff0000, 0x02030000, 0, 4);
* // -> returns -1
- * </programlisting>
+ * ]|
*/
gssize
gst_adapter_masked_scan_uint32 (GstAdapter * adapter, guint32 mask,