ext/metadata/: Add mapping of format and mime type to xmp.

Original commit message from CVS:
* ext/metadata/metadata_mapping.htm:
* ext/metadata/metadataxmp.c:
* ext/metadata/Makefile.am:
Add mapping of format and mime type to xmp.

diff --git a/ChangeLog b/ChangeLog
index bd4c52a..18457b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-03  Stefan Kost  <ensonic@users.sf.net>
+
+       * ext/metadata/metadata_mapping.htm:
+       * ext/metadata/metadataxmp.c:
+       * ext/metadata/Makefile.am:
+         Add mapping of format and mime type to xmp.
+
 2008-10-02  Stefan Kost  <ensonic@users.sf.net>
 
        * ext/metadata/README:
@@ -12,7 +19,7 @@
        * ext/metadata/metadataexif.c:
        * ext/metadata/metadatatags.c:
        * ext/metadata/metadatatags.h:
-         Use core gsp tags.
+         Use core gps tags.
 
 2008-09-30  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 

diff --git a/ext/metadata/Makefile.am b/ext/metadata/Makefile.am
index 5c1a382..5e83bb3 100644 (file)
--- a/ext/metadata/Makefile.am
+++ b/ext/metadata/Makefile.am
@@ -35,3 +35,4 @@ noinst_HEADERS =      gstmetadatademux.h   \
                        gstmetadatamux.h     \
                        gstbasemetadata.h
 
+EXTRA_DIST = metadata_mapping.htm

diff --git a/ext/metadata/metadata_mapping.htm b/ext/metadata/metadata_mapping.htm
index 64c14d1..6b226bc 100644 (file)
--- a/ext/metadata/metadata_mapping.htm
+++ b/ext/metadata/metadata_mapping.htm
@@ -1256,8 +1256,62 @@
                        <P CLASS="western" ALIGN=LEFT>“<FONT SIZE=1 STYLE="font-size: 8pt">dc:title”</FONT></P>
                </TD>
        </TR>
+       <TR VALIGN=TOP>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CODEC</FONT></P>
+               </TD>
+               <TD WIDTH=14%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+               </TD>
+               <TD WIDTH=11%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;codec&quot;</FONT></P>
+               </TD>
+               <TD WIDTH=11%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
+               </TD>
+               <TD WIDTH=14%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">A
+                       textual definition of the object type.</FONT></P>
+               </TD>
+               <TD WIDTH=14%>
+                       <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+               </TD>
+               <TD WIDTH=13%>
+                       <PRE STYLE="text-align: left"><FONT SIZE=1 STYLE="font-size: 8pt">IPTC_TAG_OBJECT_TYPE</FONT></PRE>
+               </TD>
+               <TD WIDTH=10%>
+                       <P CLASS="western" ALIGN=LEFT>“<FONT SIZE=1 STYLE="font-size: 8pt">dc:type”</FONT></P>
+               </TD>
+       </TR>
+       <TR VALIGN=TOP>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_VIDEO_CODEC</FONT></P>
+               </TD>
+               <TD WIDTH=14%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+               </TD>
+               <TD WIDTH=11%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;video-codec&quot;</FONT></P>
+               </TD>
+               <TD WIDTH=11%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
+               </TD>
+               <TD WIDTH=14%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Image
+                       format.</FONT></P>
+               </TD>
+               <TD WIDTH=14%>
+                       <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+               </TD>
+               <TD WIDTH=13%>
+                       <PRE STYLE="text-align: left"><FONT SIZE=1 STYLE="font-size: 8pt">IPTC_TAG_IMAGE_TYPE</FONT></PRE>
+               </TD>
+               <TD WIDTH=10%>
+                       <P CLASS="western" ALIGN=LEFT>“<FONT SIZE=1 STYLE="font-size: 8pt">dc:format”</FONT></P>
+               </TD>
+       </TR>
 </TABLE>
 <P CLASS="western" STYLE="margin-bottom: 0cm"><BR>
 </P>
 </BODY>
-</HTML>
\ No newline at end of file
+</HTML>

diff --git a/ext/metadata/metadataxmp.c b/ext/metadata/metadataxmp.c
index 2aa386e..4da279d 100644 (file)
--- a/ext/metadata/metadataxmp.c
+++ b/ext/metadata/metadataxmp.c
@@ -160,6 +160,8 @@ static const SchemaTagMap schema_map_dublin_tags_map[] = {
   {"description", GST_TAG_DESCRIPTION },
   {"title",       GST_TAG_TITLE       },
   {"rights",      GST_TAG_COPYRIGHT   },
+  {"type",        GST_TAG_CODEC       },
+  {"format",      GST_TAG_VIDEO_CODEC },
   {NULL, NULL}
 };
 /* *INDENT-ON* */