summaryrefslogtreecommitdiffstats
path: root/media/img_utils
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2014-06-03 23:39:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-03 23:39:06 +0000
commit61378ccba48bb826988cdc585b264fdd999e1e6a (patch)
tree408995271b1278cce59795b21ea1294c80a0381b /media/img_utils
parent62aaabb3905c61bb7acd6037414c206240a31c32 (diff)
parent8c472f09e49884146ef7d83917ec482208d320c2 (diff)
downloadframeworks_av-61378ccba48bb826988cdc585b264fdd999e1e6a.zip
frameworks_av-61378ccba48bb826988cdc585b264fdd999e1e6a.tar.gz
frameworks_av-61378ccba48bb826988cdc585b264fdd999e1e6a.tar.bz2
Merge "DNG: Add additional TIFF/EP tag definitions." into lmp-preview-dev
Diffstat (limited to 'media/img_utils')
-rw-r--r--media/img_utils/include/img_utils/TagDefinitions.h48
1 files changed, 48 insertions, 0 deletions
diff --git a/media/img_utils/include/img_utils/TagDefinitions.h b/media/img_utils/include/img_utils/TagDefinitions.h
index 9232e58..6cc42b2 100644
--- a/media/img_utils/include/img_utils/TagDefinitions.h
+++ b/media/img_utils/include/img_utils/TagDefinitions.h
@@ -172,8 +172,14 @@ enum {
TAG_ARTIST = 0x013Bu,
TAG_EXIFVERSION = 0x9000u,
TAG_CFAREPEATPATTERNDIM = 0x828Du,
+ TAG_DATETIMEORIGINAL = 0x9003u,
TAG_CFAPATTERN = 0x828Eu,
TAG_SUBIFDS = 0x014Au,
+ TAG_TIFFEPSTANDARDID = 0x9216u,
+ TAG_EXPOSURETIME = 0x829Au,
+ TAG_ISOSPEEDRATINGS = 0x8827u,
+ TAG_FOCALLENGTH = 0x920Au,
+ TAG_FNUMBER = 0x829Du,
};
/**
@@ -208,6 +214,48 @@ const TagDefinition_t TIFF_EP_TAG_DEFINITIONS[] = {
2,
UNDEFINED_ENDIAN
},
+ { // DateTimeOriginal
+ 0x9003u,
+ ASCII,
+ IFD_0,
+ 20,
+ UNDEFINED_ENDIAN
+ },
+ { // Tiff/EPStandardID
+ 0x9216u,
+ BYTE,
+ IFD_0,
+ 4,
+ UNDEFINED_ENDIAN
+ },
+ { // ExposureTime
+ 0x829Au,
+ RATIONAL,
+ IFD_0,
+ 0,
+ UNDEFINED_ENDIAN
+ },
+ { // ISOSpeedRatings
+ 0x8827u,
+ SHORT,
+ IFD_0,
+ 0,
+ UNDEFINED_ENDIAN
+ },
+ { // FocalLength
+ 0x920Au,
+ RATIONAL,
+ IFD_0,
+ 0,
+ UNDEFINED_ENDIAN
+ },
+ { // FNumber
+ 0x829Du,
+ RATIONAL,
+ IFD_0,
+ 0,
+ UNDEFINED_ENDIAN
+ },
/*TODO: Remaining TIFF EP tags*/
};