From f95e77afc6ed0938b57c1c1640b0730e8a1ca93f Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 1 Dec 2011 18:50:32 +0100 Subject: [PATCH] taglist: make some tags of type GstSample Make the image and attachment tags of type GstSample so that we can include extra caps and info along with the buffer data. --- gst/gsttaglist.c | 6 +++--- gst/gsttaglist.h | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gst/gsttaglist.c b/gst/gsttaglist.c index 9afbef1d42..d7c95b298c 100644 --- a/gst/gsttaglist.c +++ b/gst/gsttaglist.c @@ -270,12 +270,12 @@ _priv_gst_tag_initialize (void) gst_tag_register (GST_TAG_LANGUAGE_CODE, GST_TAG_FLAG_META, G_TYPE_STRING, _("language code"), _("language code for this stream, conforming to ISO-639-1"), NULL); - gst_tag_register (GST_TAG_IMAGE, GST_TAG_FLAG_META, GST_TYPE_BUFFER, + gst_tag_register (GST_TAG_IMAGE, GST_TAG_FLAG_META, GST_TYPE_SAMPLE, _("image"), _("image related to this stream"), gst_tag_merge_use_first); - gst_tag_register (GST_TAG_PREVIEW_IMAGE, GST_TAG_FLAG_META, GST_TYPE_BUFFER, + gst_tag_register (GST_TAG_PREVIEW_IMAGE, GST_TAG_FLAG_META, GST_TYPE_SAMPLE, /* TRANSLATORS: 'preview image' = image that shows a preview of the full image */ _("preview image"), _("preview image related to this stream"), NULL); - gst_tag_register (GST_TAG_ATTACHMENT, GST_TAG_FLAG_META, GST_TYPE_BUFFER, + gst_tag_register (GST_TAG_ATTACHMENT, GST_TAG_FLAG_META, GST_TYPE_SAMPLE, _("attachment"), _("file attached to this stream"), gst_tag_merge_use_first); gst_tag_register (GST_TAG_BEATS_PER_MINUTE, GST_TAG_FLAG_META, G_TYPE_DOUBLE, diff --git a/gst/gsttaglist.h b/gst/gsttaglist.h index 92df1f9407..8a4888785b 100644 --- a/gst/gsttaglist.h +++ b/gst/gsttaglist.h @@ -24,6 +24,7 @@ #define __GST_TAGLIST_H__ #include +#include #include #include @@ -719,7 +720,7 @@ gboolean gst_tag_list_get_buffer_index (const GstTagList * list, /** * GST_TAG_IMAGE: * - * image (buffer) (buffer caps should specify the content type and preferably + * image (sample) (sample caps should specify the content type and preferably * also set "image-type" field as #GstTagImageType) * * Since: 0.10.6 @@ -729,7 +730,7 @@ gboolean gst_tag_list_get_buffer_index (const GstTagList * list, * GST_TAG_PREVIEW_IMAGE: * * image that is meant for preview purposes, e.g. small icon-sized version - * (buffer) (buffer caps should specify the content type) + * (sample) (sample caps should specify the content type) * * Since: 0.10.7 */ @@ -738,7 +739,7 @@ gboolean gst_tag_list_get_buffer_index (const GstTagList * list, /** * GST_TAG_ATTACHMENT: * - * generic file attachment (buffer) (buffer caps should specify the content + * generic file attachment (sample) (sample caps should specify the content * type and if possible set "filename" to the file name of the * attachment) *