From 5aa73f078a997f63f8bfec0746ceaa5e3ec9e986 Mon Sep 17 00:00:00 2001 From: Edgard Lima Date: Sat, 2 Feb 2008 20:22:19 +0000 Subject: Map more Exif tags. Original commit message from CVS: Map more Exif tags. --- ChangeLog | 10 + common | 2 +- ext/metadata/TODO | 10 +- ext/metadata/gstmetadatamux.c | 4 +- ext/metadata/metadata_mapping.htm | 493 +++++++++++++++++++++++++------------- ext/metadata/metadataexif.c | 77 +++--- ext/metadata/metadatatags.c | 111 +++++++++ ext/metadata/metadatatags.h | 7 +- 8 files changed, 517 insertions(+), 197 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1715cae7..5365c1be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-02-02 Edgard Lima + + * ext/metadata/TODO: + * ext/metadata/gstmetadatamux.c: + * ext/metadata/metadata_mapping.htm: + * ext/metadata/metadataexif.c: + * ext/metadata/metadatatags.c: + * ext/metadata/metadatatags.h: + Map more Exif tags. + 2008-02-01 Wim Taymans * gst/selector/gstinputselector.c: (gst_selector_pad_event): diff --git a/common b/common index 571dce33..3c547316 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 571dce3335f9be76978009b3842c050dbb900e6f +Subproject commit 3c5473161ce19a3530bad279b842d542895b1500 diff --git a/ext/metadata/TODO b/ext/metadata/TODO index 58666c97..62ad06d8 100644 --- a/ext/metadata/TODO +++ b/ext/metadata/TODO @@ -11,8 +11,7 @@ TODO: 2- Get properties like 'width' and 'height' from caps 3- Review the code (in order to move to gst-plugins-good) 4- Document how the plugin works (atchitecture and interaction beteween modules) -5- Create a HTML with the mapping (and conversion) beteween GST tags and EXIF, IPTC and XMP tags -6- Improve the test application (to save also in png and to make it possible to set the metadata elements properties) +5- Improve the test application (to save also in png and to make it possible to set the metadata elements properties) OPEN ISSUES: @@ -39,4 +38,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=503616 KNOWN BUGS +bugs in libexif: + +https://sourceforge.net/tracker/?func=detail&atid=112272&aid=1884609&group_id=12272 + +1- EXIF_TAG_ISO_SPEED_RATINGS should be in EXIF_IFD_EXIF +2- EXIF_TAG_ISO_SPEED_RATINGS is not inserted anyway + diff --git a/ext/metadata/gstmetadatamux.c b/ext/metadata/gstmetadatamux.c index 256d7d21..d75c686d 100644 --- a/ext/metadata/gstmetadatamux.c +++ b/ext/metadata/gstmetadatamux.c @@ -508,9 +508,11 @@ gst_metadata_mux_sink_event (GstPad * pad, GstEvent * event) { GstTagList *taglist = NULL; GstTagSetter *setter = GST_TAG_SETTER (filter); + const GstTagMergeMode mode = gst_tag_setter_get_tag_merge_mode (setter); gst_event_parse_tag (event, &taglist); - gst_tag_setter_merge_tags (setter, taglist, GST_TAG_MERGE_REPLACE); + gst_tag_setter_merge_tags (setter, taglist, mode); + } break; diff --git a/ext/metadata/metadata_mapping.htm b/ext/metadata/metadata_mapping.htm index af9b6c7d..f6c6ba1c 100644 --- a/ext/metadata/metadata_mapping.htm +++ b/ext/metadata/metadata_mapping.htm @@ -7,7 +7,8 @@ - + +