From 115636d6d6cbb2d65c4cfaf2298050af73ee816a Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Mon, 4 Aug 2008 07:17:38 +0000 Subject: gst/qtdemux/: Add keyword tag support. Fixes #520694 for qtdemux. Original commit message from CVS: * gst/qtdemux/qtdemux.c: * gst/qtdemux/qtdemux_fourcc.h: Add keyword tag support. Fixes #520694 for qtdemux. --- ChangeLog | 6 ++++++ gst/qtdemux/qtdemux.c | 11 +++++++++++ gst/qtdemux/qtdemux_fourcc.h | 2 ++ 3 files changed, 19 insertions(+) diff --git a/ChangeLog b/ChangeLog index 298e47ee..d4e23c08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-04 Stefan Kost + + * gst/qtdemux/qtdemux.c: + * gst/qtdemux/qtdemux_fourcc.h: + Add keyword tag support. Fixes #520694 for qtdemux. + 2008-08-04 Stefan Kost * gst/qtdemux/qtdemux.c: diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index e940bafd..32cee0e5 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -4033,6 +4033,17 @@ qtdemux_parse_udta (GstQTDemux * qtdemux, GNode * udta) if (node) { qtdemux_tag_add_tmpo (qtdemux, GST_TAG_BEATS_PER_MINUTE, node); } + + node = qtdemux_tree_get_child_by_type (ilst, FOURCC_keyw); + if (node) { + qtdemux_tag_add_str (qtdemux, GST_TAG_KEYWORDS, node); + } else { + node = qtdemux_tree_get_child_by_type (ilst, FOURCC_kywd); + if (node) { + qtdemux_tag_add_str (qtdemux, GST_TAG_KEYWORDS, node); + } + } + } typedef struct diff --git a/gst/qtdemux/qtdemux_fourcc.h b/gst/qtdemux/qtdemux_fourcc.h index a721ecf4..96ee218e 100644 --- a/gst/qtdemux/qtdemux_fourcc.h +++ b/gst/qtdemux/qtdemux_fourcc.h @@ -130,6 +130,8 @@ G_BEGIN_DECLS #define FOURCC_url_ GST_MAKE_FOURCC('u','r','l',' ') #define FOURCC_frma GST_MAKE_FOURCC('f','r','m','a') #define FOURCC_ctts GST_MAKE_FOURCC('c','t','t','s') +#define FOURCC_keyw GST_MAKE_FOURCC('k','e','y','w') +#define FOURCC_kywd GST_MAKE_FOURCC('k','y','w','d') /* Xiph fourcc */ #define FOURCC_XiTh GST_MAKE_FOURCC('X','i','T','h') -- cgit