commit af63882e6a3519b734536072ed0b5c86edf82202
author Chong Zhang <chz@google.com> Wed Dec 09 17:19:25 2020 -0800
committer Chong Zhang <chz@google.com> Tue Dec 15 13:39:56 2020 -0800
tree 951c87a927d4f5e603effa8590f3ad2f2283309a
parent dcff92a238fd66d271f0a5aedb4c7bed96899954

Parse XMP offset/size for HEIF

bug: 159373092
test: local manual test that ExifInterface gets the XMP offset/size
correctly

Change-Id: Ie3dda2a716a1e6d104367182461329cb4b23fa44

media/extractors/mp4/ItemTable.h

diff --git a/media/extractors/mp4/ItemTable.h b/media/extractors/mp4/ItemTable.h
index b19dc18..62826b6 100644
--- a/media/extractors/mp4/ItemTable.h
+++ b/media/extractors/mp4/ItemTable.h
@@ -34,7 +34,7 @@
 
 struct AssociationEntry;
 struct ImageItem;
-struct ExifItem;
+struct ExternalMetaItem;
 struct ItemLoc;
 struct ItemInfo;
 struct ItemProperty;
@@ -59,6 +59,7 @@
     status_t getImageOffsetAndSize(
             uint32_t *itemIndex, off64_t *offset, size_t *size);
     status_t getExifOffsetAndSize(off64_t *offset, size_t *size);
+    status_t getXmpOffsetAndSize(off64_t *offset, size_t *size);
 
 protected:
     ~ItemTable();
@@ -84,7 +85,7 @@
     bool mImageItemsValid;
     uint32_t mCurrentItemIndex;
     KeyedVector<uint32_t, ImageItem> mItemIdToItemMap;
-    KeyedVector<uint32_t, ExifItem> mItemIdToExifMap;
+    KeyedVector<uint32_t, ExternalMetaItem> mItemIdToMetaMap;
     Vector<uint32_t> mDisplayables;
 
     status_t parseIlocBox(off64_t offset, size_t size);