mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

adapter: Also copy POOL metas and make sure to copy over metas when creating subbuffers

Browse source 
POOL meta just means that this specific instance of the meta is related to a
pool, a copy should be made when reasonable and the flag should just not be
set in the copy.
This commit is contained in:
Sebastian Dröge 2015-07-01 10:45:01 +02:00
parent 0aae36567d
commit fefd4622a3
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libs/gst/base/gstadapter.c
View file

@ -795,7 +795,8 @@ gst_adapter_get_buffer_fast (GstAdapter * adapter, gsize nbytes)
GST_LOG_OBJECT (adapter, "appending %" G_GSIZE_FORMAT " bytes" GST_LOG_OBJECT (adapter, "appending %" G_GSIZE_FORMAT " bytes"
" via region copy", size); " via region copy", size);
if (buffer) if (buffer)
gst_buffer_copy_into (buffer, cur, GST_BUFFER_COPY_MEMORY, skip, size); gst_buffer_copy_into (buffer, cur,
GST_BUFFER_COPY_MEMORY | GST_BUFFER_COPY_META, skip, size);
else else
buffer = gst_buffer_copy_region (cur, GST_BUFFER_COPY_ALL, skip, size); buffer = gst_buffer_copy_region (cur, GST_BUFFER_COPY_ALL, skip, size);
skip = 0; skip = 0;
@ -864,11 +865,7 @@ foreach_metadata (GstBuffer * inbuf, GstMeta ** meta, gpointer user_data)
const GstMetaInfo *info = (*meta)->info; const GstMetaInfo *info = (*meta)->info;
gboolean do_copy = FALSE; gboolean do_copy = FALSE;
if (GST_META_FLAG_IS_SET (*meta, GST_META_FLAG_POOLED)) { if (gst_meta_api_type_has_tag (info->api, _gst_meta_tag_memory)) {
/* never call the transform_meta with pool private metadata */
GST_DEBUG ("not copying pooled metadata %s", g_type_name (info->api));
do_copy = FALSE;
} else if (gst_meta_api_type_has_tag (info->api, _gst_meta_tag_memory)) {
/* never call the transform_meta with memory specific metadata */ /* never call the transform_meta with memory specific metadata */
GST_DEBUG ("not copying memory specific metadata %s", GST_DEBUG ("not copying memory specific metadata %s",
g_type_name (info->api)); g_type_name (info->api));