memory: more fixes

[platform/upstream/gstreamer.git] / gst / gstbufferlist.c

diff --git a/gst/gstbufferlist.c b/gst/gstbufferlist.c
index 7bcc746..2713803 100644 (file)
--- a/gst/gstbufferlist.c
+++ b/gst/gstbufferlist.c
@@ -836,9 +836,9 @@ GstBuffer *
 gst_buffer_list_iterator_merge_group (const GstBufferListIterator * it)
 {
   GList *tmp;
-  guint size;
+  gsize size, bsize;
   GstBuffer *buf;
-  guint8 *ptr;
+  guint8 *dest, *ptr, *bdata;
 
   g_return_val_if_fail (it != NULL, NULL);
 
@@ -847,7 +847,7 @@ gst_buffer_list_iterator_merge_group (const GstBufferListIterator * it)
   tmp = it->next;
   while (tmp && tmp->data != GROUP_START) {
     if (tmp->data != STOLEN) {
-      size += GST_BUFFER_SIZE (tmp->data);
+      size += gst_buffer_get_size (tmp->data);
     }
     tmp = g_list_next (tmp);
   }
@@ -860,19 +860,26 @@ gst_buffer_list_iterator_merge_group (const GstBufferListIterator * it)
   buf = gst_buffer_new_and_alloc (size);
 
   /* copy metadata from the next buffer after the implicit cursor */
-  gst_buffer_copy_metadata (buf, GST_BUFFER_CAST (it->next->data),
-      GST_BUFFER_COPY_ALL);
+  gst_buffer_copy_into (buf, GST_BUFFER_CAST (it->next->data),
+      GST_BUFFER_COPY_METADATA, 0, 0);
 
   /* copy data of all buffers before the next group start into the new buffer */
-  ptr = GST_BUFFER_DATA (buf);
+  dest = ptr = gst_buffer_map (buf, NULL, NULL, GST_MAP_WRITE);
   tmp = it->next;
   do {
     if (tmp->data != STOLEN) {
-      memcpy (ptr, GST_BUFFER_DATA (tmp->data), GST_BUFFER_SIZE (tmp->data));
-      ptr += GST_BUFFER_SIZE (tmp->data);
+
+      bdata =
+          gst_buffer_map (GST_BUFFER_CAST (tmp->data), &bsize, NULL,
+          GST_MAP_READ);
+      memcpy (ptr, bdata, bsize);
+      gst_buffer_unmap (GST_BUFFER_CAST (tmp->data), bdata, bsize);
+      ptr += bsize;
     }
     tmp = g_list_next (tmp);
   } while (tmp && tmp->data != GROUP_START);
 
+  gst_buffer_unmap (buf, dest, size);
+
   return buf;
 }