From dc23684b127d8cb1d3ddb12afc7d53a2a8230f99 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 1 Dec 2011 15:34:06 +0100
Subject: [PATCH] buffer: add copy flag for meta

Add a flag to control if the meta should be copied or not instead of always
copying.
---
 gst/gstbuffer.c | 12 +++++++-----
 gst/gstbuffer.h | 10 +++++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index 32099a29ff..f95a6a7b71 100644
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -323,12 +323,14 @@ gst_buffer_copy_into (GstBuffer * dest, GstBuffer * src,
     }
   }
 
-  for (walk = GST_BUFFER_META (src); walk; walk = walk->next) {
-    GstMeta *meta = &walk->meta;
-    const GstMetaInfo *info = meta->info;
+  if (flags & GST_BUFFER_COPY_META) {
+    for (walk = GST_BUFFER_META (src); walk; walk = walk->next) {
+      GstMeta *meta = &walk->meta;
+      const GstMetaInfo *info = meta->info;
 
-    if (info->copy_func)
-      info->copy_func (dest, meta, src, offset, size);
+      if (info->copy_func)
+        info->copy_func (dest, meta, src, offset, size);
+    }
   }
 }
 
diff --git a/gst/gstbuffer.h b/gst/gstbuffer.h
index 20caf8f234..b9d35cfa0f 100644
--- a/gst/gstbuffer.h
+++ b/gst/gstbuffer.h
@@ -393,6 +393,8 @@ gst_buffer_copy (const GstBuffer * buf)
  * and appended to already existing memory
  * @GST_BUFFER_COPY_MERGE: flag indicating that buffer memory should be
  * merged
+ * @GST_BUFFER_COPY_META: flag indicating that buffer meta should be
+ * copied
  *
  * A set of flags that can be provided to the gst_buffer_copy_into()
  * function to specify which items should be copied.
@@ -401,8 +403,9 @@ typedef enum {
   GST_BUFFER_COPY_NONE           = 0,
   GST_BUFFER_COPY_FLAGS          = (1 << 0),
   GST_BUFFER_COPY_TIMESTAMPS     = (1 << 1),
-  GST_BUFFER_COPY_MEMORY         = (1 << 2),
-  GST_BUFFER_COPY_MERGE          = (1 << 3)
+  GST_BUFFER_COPY_META           = (1 << 2),
+  GST_BUFFER_COPY_MEMORY         = (1 << 3),
+  GST_BUFFER_COPY_MERGE          = (1 << 4)
 } GstBufferCopyFlags;
 
 /**
@@ -411,7 +414,8 @@ typedef enum {
  * Combination of all possible metadata fields that can be copied with
  * gst_buffer_copy_into().
  */
-#define GST_BUFFER_COPY_METADATA       (GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS)
+#define GST_BUFFER_COPY_METADATA       (GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS |\
+                                        GST_BUFFER_COPY_META)
 
 /**
  * GST_BUFFER_COPY_ALL: