Map more Exif tags.

Original commit message from CVS:
Map more Exif tags.

diff --git a/ChangeLog b/ChangeLog
index 1715cae..5365c1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-02  Edgard Lima  <edgard.lima@indt.org.br>
+
+       * 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  <wim.taymans@collabora.co.uk>
 
        * gst/selector/gstinputselector.c: (gst_selector_pad_event):

diff --git a/common b/common
index 571dce3..3c54731 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 571dce3335f9be76978009b3842c050dbb900e6f
+Subproject commit 3c5473161ce19a3530bad279b842d542895b1500

diff --git a/ext/metadata/TODO b/ext/metadata/TODO
index 58666c9..62ad06d 100644 (file)
--- 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 256d7d2..d75c686 100644 (file)
--- 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 af9b6c7..f6c6ba1 100644 (file)
--- a/ext/metadata/metadata_mapping.htm
+++ b/ext/metadata/metadata_mapping.htm
@@ -7,7 +7,8 @@
        <META NAME="AUTHOR" CONTENT="Edgard Lima">
        <META NAME="CREATED" CONTENT="20080131;12581600">
        <META NAME="CHANGEDBY" CONTENT="Edgard Lima">
-       <META NAME="CHANGED" CONTENT="20080131;23155400">
+       <META NAME="CHANGED" CONTENT="20080202;22134000">
+       <!--  -->
        <META NAME="CHANGEDBY" CONTENT="Edgard Lima">
        <STYLE TYPE="text/css">
        <!--
@@ -26,13 +27,13 @@
        <COL WIDTH=32*>
        <COL WIDTH=39*>
        <COL WIDTH=25*>
+       <COL WIDTH=31*>
+       <COL WIDTH=33*>
        <COL WIDTH=32*>
        <COL WIDTH=32*>
-       <COL WIDTH=32*>
-       <COL WIDTH=32*>
-       <COL WIDTH=32*>
+       <COL WIDTH=31*>
        <TR VALIGN=TOP>
-               <TD WIDTH=12% BGCOLOR="#cccccc">
+               <TD WIDTH=13% BGCOLOR="#cccccc">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt"><B>gsttaglist.h</B></FONT></P>
                </TD>
                <TD WIDTH=15% BGCOLOR="#cccccc">
@@ -44,21 +45,21 @@
                <TD WIDTH=12% BGCOLOR="#cccccc">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt"><B>type</B></FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#cccccc">
+               <TD WIDTH=13% BGCOLOR="#cccccc">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt"><B>description</B></FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#cccccc">
+               <TD WIDTH=13% BGCOLOR="#cccccc">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt"><B>EXIF</B></FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#cccccc">
+               <TD WIDTH=13% BGCOLOR="#cccccc">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt"><B>IPTC</B></FONT></P>
                </TD>
-               <TD WIDTH=13% BGCOLOR="#cccccc">
+               <TD WIDTH=12% BGCOLOR="#cccccc">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt"><B>XMP</B></FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
                <TD WIDTH=15%>
@@ -70,22 +71,22 @@
                <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_BUFFER</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">exif
                        chunk that could be used directly by the application</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">exif_data_new_from_data()</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=13%>
+               <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
                <TD WIDTH=15% BGCOLOR="#e6e6ff">
@@ -97,22 +98,22 @@
                <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_BUFFER</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">iptc
                        chunk that could be used directly by the application</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">iptc_data_new_from_data()</FONT></P>
                </TD>
-               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
                <TD WIDTH=15%>
@@ -124,22 +125,22 @@
                <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_BUFFER</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">xmp
                        chunk that could be used directly by the application</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=13%>
+               <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">xmp_new()</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
                <TD WIDTH=15% BGCOLOR="#e6e6ff">
@@ -151,22 +152,22 @@
                <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
-                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;Brightness
-                       (APEX from -99.99 to 99.99)&quot;</FONT></P>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Brightness
+                       (APEX from -99.99 to 99.99)</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_BRIGHTNESS_VALUE</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
                <TD WIDTH=15%>
@@ -178,25 +179,25 @@
                <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_INT</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">from
                        -100 to 100:<BR>[-100, -34] – soft ;<BR>[-33, 33] – normal
                        ;<BR>[34, 100] – hard </FONT>
                        </P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_CONTRAST<BR>0-
                        normal;<BR>1- soft;<BR>2- hard</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=13%>
+               <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
                <TD WIDTH=15% BGCOLOR="#e6e6ff">
@@ -208,22 +209,22 @@
                <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
-                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;Digital
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Digital
                        zoom ratio&quot;<BR>(zero, means digital zoom not used)</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_DIGITAL_ZOOM_RATIO</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
                <TD WIDTH=15%>
@@ -235,14 +236,14 @@
                <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></P>
                </TD>
-               <TD WIDTH=12%>
-                       <P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0.5cm"><FONT SIZE=1 STYLE="font-size: 8pt">0
-                       - not defined ; 1- Manual; 2- Normal program ; 3- Aperture
-                       priority ; 4- Shutter priority ; 5- Creative program (biased
-                       toward death of field); 6- Action program (biased toward fast
-                       shutter speed); 7- Portrait mode (for closeup photos with the
-                       background out of focus) ; 8- Landscape mode (for landscape photos
-                       with the background in focus) </FONT>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0.5cm"><FONT SIZE=1 STYLE="font-size: 8pt">0-
+                       not defined; 1-Manual; 2- Normal program ; 3- Aperture priority ;
+                       4- Shutter priority ; 5- Creative program (biased toward death of
+                       field); 6- Action program (biased toward fast shutter speed); 7-
+                       Portrait mode (for closeup photos with the background out of
+                       focus) ; 8- Landscape mode (for landscape photos with the
+                       background in focus) </FONT>
                        </P>
                        <P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0.5cm"><FONT SIZE=1 STYLE="font-size: 8pt">***
                        exif is until here *** </FONT>
@@ -251,20 +252,20 @@
                        Night ; 10- Back-light ; 11- Spotlight ; 12- Snow ; 13- Beach </FONT>
                        </P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0.5cm"><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_EXPOSURE_PROGRAM</FONT></P>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">(only
                        from 0 to 8)</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=13%>
+               <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
                <TD WIDTH=15% BGCOLOR="#e6e6ff">
@@ -276,49 +277,128 @@
                <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
-                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;Exposure
-                       time in seconds&quot;</FONT></P>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Exposure
+                       time in seconds</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_EXPOSURE_TIME</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12%>
-                       <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=CENTER><BR>
+                       </P>
                </TD>
                <TD WIDTH=15%>
-                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_FNUMBER</FONT></P>
+                       <P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_FLASH</FONT></FONT></P>
                </TD>
                <TD WIDTH=10%>
-                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;captute-fnumber&quot;</FONT></P>
+                       <P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-flash&quot;</FONT></FONT></P>
                </TD>
                <TD WIDTH=12%>
-                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
+                       <P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></FONT></P>
                </TD>
-               <TD WIDTH=12%>
-                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;F
-                       number (focal ratio)&quot;</FONT></P>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">0000.H
+                       = Flash did not fire; 0001.H = Flash fired; 0005.H = Strobe return
+                       light not detected; 0007.H = Strobe return light detected; 0009.H
+                       = Flash fired, compulsory flash mode; 000D.H = Flash fired,
+                       compulsory flash mode, return light not detected; 000F.H = Flash
+                       fired, compulsory flash mode, return light detected; 0010.H =
+                       Flash did not fire, compulsory flash mode; 0018.H = Flash did not
+                       fire, auto mode; 0019.H = Flash fired, auto mode; 001D.H = Flash
+                       fired, auto mode, return light not detected; 001F.H = Flash fired,
+                       auto mode, return light detected; 0020.H = No flash function;
+                       0041.H = Flash fired, red-eye reduction mode; 0045.H = Flash
+                       fired, red-eye reduction mode, return light not detected; 0047.H =
+                       Flash fired, red-eye reduction mode, return light detected; 0049.H
+                       = Flash fired, compulsory flash mode, red-eye reduction mode;
+                       004D.H = Flash fired, compulsory flash mode, red-eye reduction
+                       mode, return light not detected; 004F.H = Flash fired, compulsory
+                       flash mode, red-eye reduction mode, return light detected; 0059.H
+                       = Flash fired, auto mode, red-eye reduction mode; 005D.H = Flash
+                       fired, auto mode, return light not detected, red-eye reduction
+                       mode; 005F.H = Flash fired, auto mode, return light detected,
+                       red-eye reduction mode; Other  = reserved</FONT></FONT></P>
+               </TD>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0.5cm"><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_FLASH</FONT></FONT></P>
+                       <P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">BUG
+                       in libexif. Can't be created in a exif data created from the
+                       scratch (exif-tag.c – ExifTagTable missing ifd information for
+                       Flash tag)</FONT></FONT></P>
+               </TD>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=CENTER><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></FONT></P>
                </TD>
                <TD WIDTH=12%>
+                       <P CLASS="western" ALIGN=CENTER><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></FONT></P>
+               </TD>
+       </TR>
+       <TR VALIGN=TOP>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+               </TD>
+               <TD WIDTH=15% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_FNUMBER</FONT></P>
+               </TD>
+               <TD WIDTH=10% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-fnumber&quot;</FONT></P>
+               </TD>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
+               </TD>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">F
+                       number (focal ratio)</FONT></P>
+               </TD>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_FNUMBER</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+               </TD>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
+       </TR>
+       <TR VALIGN=TOP>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=CENTER><BR>
+                       </P>
+               </TD>
+               <TD WIDTH=15%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_FOCAL_LEN</FONT></P>
+               </TD>
+               <TD WIDTH=10%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-focal-len&quot;</FONT></P>
+               </TD>
+               <TD WIDTH=12%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
+               </TD>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Focal
+                       length of lens used to take image. Unit is millimeter</FONT></P>
+               </TD>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_FOCAL_LENGTH</FONT></P>
+               </TD>
                <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
+               <TD WIDTH=12%>
+                       <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+               </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
                <TD WIDTH=15% BGCOLOR="#e6e6ff">
@@ -330,64 +410,157 @@
                <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">0-
                        None ; 1- Low gain up ; 2- High gain up ; 3- Low gain down ; 4-
                        High gain down</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_GAIN_CONTROL</FONT></P>
                </TD>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+               </TD>
                <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
+       </TR>
+       <TR VALIGN=TOP>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=CENTER><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></FONT></P>
+               </TD>
+               <TD WIDTH=15%>
+                       <P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_ISO_SPEED_RATINGS</FONT></FONT></P>
+               </TD>
+               <TD WIDTH=10%>
+                       <P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-iso-speed-ratings&quot;</FONT></FONT></P>
+               </TD>
+               <TD WIDTH=12%>
+                       <P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_INT</FONT></FONT></P>
+               </TD>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">ISO
+                       Speed and ISO Latitude as specified in ISO 12232</FONT></FONT></P>
+               </TD>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_ISO_SPEED_RATINGS<BR>BUG:
+                       <A HREF="https://sourceforge.net/tracker/?func=detail&amp;atid=112272&amp;aid=1884609&amp;group_id=12272">clique
+                       here</A></FONT></FONT></P>
+               </TD>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=CENTER><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></FONT></P>
+               </TD>
+               <TD WIDTH=12%>
+                       <P CLASS="western" ALIGN=CENTER><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></FONT></P>
+               </TD>
+       </TR>
+       <TR VALIGN=TOP>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+               </TD>
+               <TD WIDTH=15% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_LIGHT_SOURCE</FONT></P>
+               </TD>
+               <TD WIDTH=10% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-light_source&quot;</FONT></P>
+               </TD>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></P>
+               </TD>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">0-
+                       unknown (default); 1- Daylight; 2- Fluorescent; 3- Tungsten
+                       (incandescent light); 4- Flash; 9- Fine weather; 10- Cloudy
+                       weather; 11- Shade; 12- Daylight fluorescent (D 5700 – 7100K);
+                       13- Day white fluorescent (N 4600 – 5400K); 14- Cool white
+                       fluorescent (W 3900 – 4500K); 15- White fluorescent (WW 3200 –
+                       3700K) 17- Standard light A; 18-Standard light B; 19- Standard
+                       light C; 20- D55; 21- D65; 22- D75; 23- D50; 24- ISO studio
+                       tungsten; 255- other light source; Other = reserved</FONT></P>
+               </TD>
                <TD WIDTH=13% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_LIGHT_SOURCE</FONT></P>
+               </TD>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+               </TD>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=CENTER><BR>
+                       </P>
+               </TD>
+               <TD WIDTH=15%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_ORIENTATION</FONT></P>
+               </TD>
+               <TD WIDTH=10%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-orientation&quot;</FONT></P>
+               </TD>
                <TD WIDTH=12%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></P>
+               </TD>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">The
+                       relation of the '0th row' and '0th column' to visual position:<BR>1-
+                       top-left; 2- top-right; 3- bottom-right; 4- bottom-left; 5-
+                       left-top; 6- right-top; 7- right-bottom; 8- left-bottom</FONT></P>
+               </TD>
+               <TD WIDTH=13%>
+                       <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_ORIENTATION</FONT></P>
+               </TD>
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=15%>
+               <TD WIDTH=12%>
+                       <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+               </TD>
+       </TR>
+       <TR VALIGN=TOP>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+                       <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+               </TD>
+               <TD WIDTH=15% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_SATURATION</FONT></P>
                </TD>
-               <TD WIDTH=10%>
+               <TD WIDTH=10% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-saturation&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_INT</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">from
                        -100 to 100:<BR>[-100, -34] – low ;<BR>[-33, 33] – normal
                        ;<BR>[34, 100] - high</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_SATURATION<BR>0-
                        normal;<BR>1- low;<BR>2- high</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=13%>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=15% BGCOLOR="#e6e6ff">
+               <TD WIDTH=15%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_WHITE_BALANCE</FONT></P>
                </TD>
-               <TD WIDTH=10% BGCOLOR="#e6e6ff">
+               <TD WIDTH=10%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-white-balance&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0.5cm"><FONT SIZE=1 STYLE="font-size: 8pt">0-
                        Auto; 1- Off </FONT>
                        </P>
@@ -398,262 +571,262 @@
                        Sunlight ; 3- Cloudy ; 4- Shade ; 5- Tungsten ; 6- Fluorescent ;
                        7- Incandescent; 8- Flash ; 9- Horizon (sun on the horizon)</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0.5cm"><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_WHITE_BALANCE</FONT></P>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">(only
                        0 and 1)</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+               <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=15%>
+               <TD WIDTH=15% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CREATOR_TOOL</FONT></P>
                </TD>
-               <TD WIDTH=10%>
+               <TD WIDTH=10% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;creator-tool&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;The
                        name of the first known tool used to create the resource. Or
                        firmware or driver version of device&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_SOFTWARE</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=13%>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=15% BGCOLOR="#e6e6ff">
+               <TD WIDTH=15%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_DEVICE_MAKE</FONT></P>
                </TD>
-               <TD WIDTH=10% BGCOLOR="#e6e6ff">
+               <TD WIDTH=10%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;device-make&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;The
                        manufacturer of the recording equipment&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_MAKE</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+               <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=15%>
+               <TD WIDTH=15% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_DEVICE_MODEL</FONT></P>
                </TD>
-               <TD WIDTH=10%>
+               <TD WIDTH=10% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;device-model&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;The
                        model name or model number of the equipment&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_MODEL</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=13%>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=15% BGCOLOR="#e6e6ff">
+               <TD WIDTH=15%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_IMAGE_XRESOLUTION</FONT></P>
                </TD>
-               <TD WIDTH=10% BGCOLOR="#e6e6ff">
+               <TD WIDTH=10%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;image-xresolution&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;Horizontal
                        resolution in pixels per inch&quot;.<BR>Here it is always in
                        inches.<BR>In EXIF it depends on EXIF_TAG_RESOLUTION_UNIT</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_X_RESOLUTION</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+               <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=15%>
+               <TD WIDTH=15% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_IMAGE_YRESOLUTION</FONT></P>
                </TD>
-               <TD WIDTH=10%>
+               <TD WIDTH=10% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;image-yresolution&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;Vertical
                        resolution in pixels per inch&quot;.<BR>Here it is always in
                        inches.<BR>In EXIF it depends on EXIF_TAG_RESOLUTION_UNIT</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_Y_RESOLUTION</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=13%>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_COMPOSER</FONT></P>
                </TD>
-               <TD WIDTH=15% BGCOLOR="#e6e6ff">
+               <TD WIDTH=15%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=10% BGCOLOR="#e6e6ff">
+               <TD WIDTH=10%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;composer&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;Name
                        of the creator of the object, e.g. writer, photographer or graphic
                        artist.&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">IPTC_TAG_BYLINE</FONT></P>
                </TD>
-               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+               <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_COPYRIGHT</FONT></P>
                </TD>
-               <TD WIDTH=15%>
+               <TD WIDTH=15% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=10%>
+               <TD WIDTH=10% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;copyright&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;Any
                        necessary copyright notice.&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">IPTC_TAG_COPYRIGHT_NOTICE</FONT></P>
                </TD>
-               <TD WIDTH=13%>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT>“<FONT SIZE=1 STYLE="font-size: 8pt">dc:rights”</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_DESCRIPTION</FONT></P>
                </TD>
-               <TD WIDTH=15% BGCOLOR="#e6e6ff">
+               <TD WIDTH=15%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=10% BGCOLOR="#e6e6ff">
+               <TD WIDTH=10%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;description&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;A
                        textual description of the data&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=12% BGCOLOR="#e6e6ff">
+               <TD WIDTH=13%>
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">IPTC_TAG_CAPTION</FONT></P>
                </TD>
-               <TD WIDTH=13% BGCOLOR="#e6e6ff">
+               <TD WIDTH=12%>
                        <P CLASS="western" ALIGN=LEFT>“<FONT SIZE=1 STYLE="font-size: 8pt">dc:description”</FONT></P>
                </TD>
        </TR>
        <TR VALIGN=TOP>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_TITLE</FONT></P>
                </TD>
-               <TD WIDTH=15%>
+               <TD WIDTH=15% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=10%>
+               <TD WIDTH=10% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;title&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;A
                        shorthand reference for the object.&quot;</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
                </TD>
-               <TD WIDTH=12%>
+               <TD WIDTH=13% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">IPTC_TAG_OBJECT_NAME</FONT></P>
                </TD>
-               <TD WIDTH=13%>
+               <TD WIDTH=12% BGCOLOR="#e6e6ff">
                        <P CLASS="western" ALIGN=LEFT>“<FONT SIZE=1 STYLE="font-size: 8pt">dc:title”</FONT></P>
                </TD>
        </TR>

diff --git a/ext/metadata/metadataexif.c b/ext/metadata/metadataexif.c
index cd275d1..1be7093 100644 (file)
--- a/ext/metadata/metadataexif.c
+++ b/ext/metadata/metadataexif.c
@@ -140,34 +140,44 @@ typedef struct _tag_MapIntStr
 /* *INDENT-OFF* */
 /* When changing this table, update 'metadata_mapping.htm' file too. */
 static MapIntStr mappedTags[] = {
-  {EXIF_TAG_MAKE,               /*ASCII,*/     EXIF_IFD_0,
-   GST_TAG_DEVICE_MAKE,              /*STRING*/},
-  {EXIF_TAG_MODEL,              /*ASCII,*/     EXIF_IFD_0,
-   GST_TAG_DEVICE_MODEL,             /*STRING*/},
-  {EXIF_TAG_SOFTWARE,           /*ASCII,*/     EXIF_IFD_0,
-   GST_TAG_CREATOR_TOOL,             /*STRING*/},
-  {EXIF_TAG_X_RESOLUTION,       /*RATIONAL,*/  EXIF_IFD_0,
-   GST_TAG_IMAGE_XRESOLUTION,        /*FRACTION*/},   /* inches */
-  {EXIF_TAG_Y_RESOLUTION,       /*RATIONAL,*/  EXIF_IFD_0,
-   GST_TAG_IMAGE_YRESOLUTION,        /*FRACTION*/},   /* inches */
-  {EXIF_TAG_EXPOSURE_TIME,      /*RATIONAL,*/  EXIF_IFD_EXIF,
-   GST_TAG_CAPTURE_EXPOSURE_TIME,    /*FRACTION*/},
-  {EXIF_TAG_FNUMBER,            /*RATIONAL,*/  EXIF_IFD_EXIF,
-   GST_TAG_CAPTURE_FNUMBER,          /*FRACTION*/},
-  {EXIF_TAG_EXPOSURE_PROGRAM,   /*SHORT,*/     EXIF_IFD_EXIF,
-   GST_TAG_CAPTURE_EXPOSURE_PROGRAM, /*UINT*/},
-  {EXIF_TAG_BRIGHTNESS_VALUE,   /*SRATIONAL,*/ EXIF_IFD_0,
-   GST_TAG_CAPTURE_BRIGHTNESS,       /*FRACTION*/},
-  {EXIF_TAG_WHITE_BALANCE,      /*SHORT,*/     EXIF_IFD_0,
-   GST_TAG_CAPTURE_WHITE_BALANCE,    /*UINT*/},
-  {EXIF_TAG_DIGITAL_ZOOM_RATIO, /*RATIONAL,*/  EXIF_IFD_0,
-   GST_TAG_CAPTURE_DIGITAL_ZOOM,     /*FRACTION*/},
-  {EXIF_TAG_GAIN_CONTROL,       /*SHORT,*/     EXIF_IFD_0,
-   GST_TAG_CAPTURE_GAIN,             /*UINT*/},
-  {EXIF_TAG_CONTRAST,           /*SHORT,*/     EXIF_IFD_0,
-   GST_TAG_CAPTURE_CONTRAST,         /*INT*/},
-  {EXIF_TAG_SATURATION,         /*SHORT,*/     EXIF_IFD_0,
-   GST_TAG_CAPTURE_SATURATION,       /*INT*/},
+  {EXIF_TAG_BRIGHTNESS_VALUE,            /*SRATIONAL,*/ EXIF_IFD_0,
+   GST_TAG_CAPTURE_BRIGHTNESS            /*GST_TYPE_FRACTION*/},
+  {EXIF_TAG_CONTRAST,                    /*SHORT,*/     EXIF_IFD_0,
+   GST_TAG_CAPTURE_CONTRAST              /*G_TYPE_INT*/},
+  {EXIF_TAG_DIGITAL_ZOOM_RATIO,          /*RATIONAL,*/  EXIF_IFD_0,
+   GST_TAG_CAPTURE_DIGITAL_ZOOM          /*GST_TYPE_FRACTION*/},
+  {EXIF_TAG_EXPOSURE_PROGRAM,            /*SHORT,*/     EXIF_IFD_EXIF,
+   GST_TAG_CAPTURE_EXPOSURE_PROGRAM      /*G_TYPE_UINT*/},
+  {EXIF_TAG_EXPOSURE_TIME,               /*RATIONAL,*/  EXIF_IFD_EXIF,
+   GST_TAG_CAPTURE_EXPOSURE_TIME         /*GST_TYPE_FRACTION*/},
+  {EXIF_TAG_FLASH,                       /*SHORT*/      EXIF_IFD_EXIF,
+   GST_TAG_CAPTURE_FLASH                 /*G_TYPE_UINT*/},
+  {EXIF_TAG_FNUMBER,                     /*RATIONAL,*/  EXIF_IFD_EXIF,
+   GST_TAG_CAPTURE_FNUMBER               /*GST_TYPE_FRACTION*/},
+  {EXIF_TAG_FOCAL_LENGTH,                /*SRATIONAL*/  EXIF_IFD_EXIF,
+   GST_TAG_CAPTURE_FOCAL_LEN             /*GST_TYPE_FRACTION*/},
+  {EXIF_TAG_GAIN_CONTROL,                /*SHORT,*/     EXIF_IFD_0,
+   GST_TAG_CAPTURE_GAIN                  /*G_TYPE_UINT*/},
+  {EXIF_TAG_ISO_SPEED_RATINGS,           /*SHORT,*/     EXIF_IFD_EXIF,
+   GST_TAG_CAPTURE_ISO_SPEED_RATINGS     /*G_TYPE_INT*/},
+  {EXIF_TAG_LIGHT_SOURCE     ,           /*SHORT,*/     EXIF_IFD_EXIF,
+   GST_TAG_CAPTURE_LIGHT_SOURCE          /*G_TYPE_UINT*/},
+  {EXIF_TAG_ORIENTATION     ,           /*SHORT,*/     EXIF_IFD_0,
+   GST_TAG_CAPTURE_ORIENTATION           /*G_TYPE_UINT*/},
+  {EXIF_TAG_SATURATION,                  /*SHORT,*/     EXIF_IFD_0,
+   GST_TAG_CAPTURE_SATURATION            /*G_TYPE_INT*/},
+  {EXIF_TAG_WHITE_BALANCE,               /*SHORT,*/     EXIF_IFD_0,
+   GST_TAG_CAPTURE_WHITE_BALANCE         /*G_TYPE_UINT*/},
+  {EXIF_TAG_SOFTWARE,                    /*ASCII,*/     EXIF_IFD_0,
+   GST_TAG_CREATOR_TOOL                  /*G_TYPE_STRING*/},
+  {EXIF_TAG_MAKE,                        /*ASCII,*/     EXIF_IFD_0,
+   GST_TAG_DEVICE_MAKE                   /*G_TYPE_STRING*/},
+  {EXIF_TAG_MODEL,                       /*ASCII,*/     EXIF_IFD_0,
+   GST_TAG_DEVICE_MODEL                  /*G_TYPE_STRING*/},
+  {EXIF_TAG_X_RESOLUTION,                /*RATIONAL,*/  EXIF_IFD_0,
+   GST_TAG_IMAGE_XRESOLUTION             /*GST_TYPE_FRACTION*/},   /* inches */
+  {EXIF_TAG_Y_RESOLUTION,                /*RATIONAL,*/  EXIF_IFD_0,
+   GST_TAG_IMAGE_YRESOLUTION             /*GST_TYPE_FRACTION*/},   /* inches */
   {0, EXIF_IFD_COUNT, NULL}
 };
 /* *INDENT-ON* */
@@ -404,10 +414,13 @@ metadataparse_exif_data_foreach_content_func (ExifContent * content,
 {
   ExifIfd ifd = exif_content_get_ifd (content);
 
-  GST_LOG ("\n  Content %p: %s (ifd=%d)", content, exif_ifd_get_name (ifd),
-      ifd);
-  exif_content_foreach_entry (content,
-      metadataparse_exif_content_foreach_entry_func, user_data);
+  if (ifd == EXIF_IFD_0 || ifd == EXIF_IFD_EXIF) {
+
+    GST_LOG ("\n  Content %p: %s (ifd=%d)", content, exif_ifd_get_name (ifd),
+        ifd);
+    exif_content_foreach_entry (content,
+        metadataparse_exif_content_foreach_entry_func, user_data);
+  }
 }
 
 /*

diff --git a/ext/metadata/metadatatags.c b/ext/metadata/metadatatags.c
index 63acf2f..c1a16a7 100644 (file)
--- a/ext/metadata/metadatatags.c
+++ b/ext/metadata/metadatatags.c
@@ -162,10 +162,71 @@ metadata_tags_exif_register (void)
   gst_tag_register (GST_TAG_CAPTURE_EXPOSURE_TIME, GST_TAG_FLAG_META,
       GST_TYPE_FRACTION, GST_TAG_CAPTURE_EXPOSURE_TIME,
       "Exposure time in seconds", NULL);
+
+  /*
+   * bits (76543210) indicating the flash status:
+   * 0- Flash firing
+   *   0- Flash did not fire
+   *   1- Flash fired
+   * 1,2- Flash return
+   *   00- No strobe return detection function
+   *   01- reserved
+   *   10- Strobe return light not detected
+   *   11- Strobe return light detected.
+   * 3,4- Flash mode
+   *   00- unknown
+   *   01- Compulsory flash firing
+   *   10- Compulsory flash suppression
+   *   11- Auto mode
+   * 5- if flash function is present
+   *   0- Flash function present
+   *   1- No flash function
+   * 6- Red-eye mode
+   *   0- No red-eye reduction mode or unknown
+   *   1- Red-eye reduction supported
+   * So, we have the following possible values:
+   *
+   * 0000.H = Flash did not fire.
+   * 0001.H = Flash fired.
+   * 0005.H = Strobe return light not detected.
+   * 0007.H = Strobe return light detected.
+   * 0009.H = Flash fired, compulsory flash mode
+   * 000D.H = Flash fired, compulsory flash mode, return light not detected
+   * 000F.H = Flash fired, compulsory flash mode, return light detected
+   * 0010.H = Flash did not fire, compulsory flash mode
+   * 0018.H = Flash did not fire, auto mode
+   * 0019.H = Flash fired, auto mode
+   * 001D.H = Flash fired, auto mode, return light not detected
+   * 001F.H = Flash fired, auto mode, return light detected
+   * 0020.H = No flash function
+   * 0041.H = Flash fired, red-eye reduction mode
+   * 0045.H = Flash fired, red-eye reduction mode, return light not detected
+   * 0047.H = Flash fired, red-eye reduction mode, return light detected
+   * 0049.H = Flash fired, compulsory flash mode, red-eye reduction mode
+   * 004D.H = Flash fired, compulsory flash mode, red-eye reduction mode,
+   *          return light not detected
+   * 004F.H = Flash fired, compulsory flash mode, red-eye reduction mode,
+   *          return light detected
+   * 0059.H = Flash fired, auto mode, red-eye reduction mode
+   * 005D.H = Flash fired, auto mode, return light not detected,
+   *          red-eye reduction mode
+   * 005F.H = Flash fired, auto mode, return light detected,
+   *          red-eye reduction mode
+   * Other  = reserved
+   */
+
+
+  gst_tag_register (GST_TAG_CAPTURE_FLASH, GST_TAG_FLAG_META,
+      G_TYPE_UINT, GST_TAG_CAPTURE_FLASH, "Flash status", NULL);
+
   gst_tag_register (GST_TAG_CAPTURE_FNUMBER, GST_TAG_FLAG_META,
       GST_TYPE_FRACTION, GST_TAG_CAPTURE_FNUMBER, "F number (focal ratio)",
       NULL);
 
+  gst_tag_register (GST_TAG_CAPTURE_FOCAL_LEN, GST_TAG_FLAG_META,
+      GST_TYPE_FRACTION, GST_TAG_CAPTURE_FOCAL_LEN,
+      "Focal length of lens used to take image. Unit is millimeter", NULL);
+
   /*
      0- None
      1- Low gain up
@@ -176,6 +237,56 @@ metadata_tags_exif_register (void)
   gst_tag_register (GST_TAG_CAPTURE_GAIN, GST_TAG_FLAG_META, G_TYPE_UINT,
       GST_TAG_CAPTURE_GAIN, "", NULL);
 
+  gst_tag_register (GST_TAG_CAPTURE_ISO_SPEED_RATINGS, GST_TAG_FLAG_META,
+      G_TYPE_INT, GST_TAG_CAPTURE_ISO_SPEED_RATINGS,
+      "ISO Speed and ISO Latitude as specified in ISO 12232", NULL);
+
+
+  /*
+     0-   unknown (default)
+     1-   Daylight
+     2-   Fluorescent
+     3-   Tungsten (incandescent light)
+     4-   Flash
+     9-   Fine weather
+     10-  Cloudy weather
+     11-  Shade
+     12-  Daylight fluorescent (D 5700 \e%G–\e%@ 7100K)
+     13-  Day white fluorescent (N 4600 \e%G–\e%@ 5400K)
+     14-  Cool white fluorescent (W 3900 \e%G–\e%@ 4500K)
+     15-  White fluorescent (WW 3200 \e%G–\e%@ 3700K)
+     17-  Standard light A
+     18-  Standard light B
+     19-  Standard light C
+     20-  D55
+     21-  D65
+     22-  D75
+     23-  D50
+     24-  ISO studio tungsten
+     255- other light source
+     Other = reserved
+   */
+
+  gst_tag_register (GST_TAG_CAPTURE_LIGHT_SOURCE, GST_TAG_FLAG_META,
+      G_TYPE_UINT, GST_TAG_CAPTURE_LIGHT_SOURCE,
+      "The kind of light source.", NULL);
+
+  /*
+   * The relation of the '0th row' and '0th column' to visual position:
+   * 1- top-left
+   * 2- top-right
+   * 3- bottom-right
+   * 4- bottom-left
+   * 5- left-top
+   * 6- right-top
+   * 7- right-bottom
+   * 8- left-bottom
+   */
+
+  gst_tag_register (GST_TAG_CAPTURE_ORIENTATION, GST_TAG_FLAG_META,
+      G_TYPE_UINT, GST_TAG_CAPTURE_ORIENTATION,
+      "The kind of light source.", NULL);
+
   /*
      from -100 to 100
      [-100, -34] - low

diff --git a/ext/metadata/metadatatags.h b/ext/metadata/metadatatags.h
index 8189f61..053e18f 100644 (file)
--- a/ext/metadata/metadatatags.h
+++ b/ext/metadata/metadatatags.h
@@ -84,8 +84,13 @@ typedef enum {
 #define GST_TAG_CAPTURE_DIGITAL_ZOOM       "capture-digital-zoom"
 #define GST_TAG_CAPTURE_EXPOSURE_PROGRAM   "capture-exposure-program"
 #define GST_TAG_CAPTURE_EXPOSURE_TIME      "capture-exposure-time"
-#define GST_TAG_CAPTURE_FNUMBER            "captute-fnumber"
+#define GST_TAG_CAPTURE_FLASH              "capture-flash"
+#define GST_TAG_CAPTURE_FNUMBER            "capture-fnumber"
+#define GST_TAG_CAPTURE_FOCAL_LEN          "capture-focal-len"
 #define GST_TAG_CAPTURE_GAIN               "capture-gain"
+#define GST_TAG_CAPTURE_ISO_SPEED_RATINGS  "capture-iso-speed-ratings"
+#define GST_TAG_CAPTURE_LIGHT_SOURCE       "capture-light_source"
+#define GST_TAG_CAPTURE_ORIENTATION        "capture-orientation"
 #define GST_TAG_CAPTURE_SATURATION         "capture-saturation"
 #define GST_TAG_CAPTURE_WHITE_BALANCE      "capture-white-balance"