summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/include/MPEG4Extractor.h
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2015-04-14 22:28:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-14 22:28:27 +0000
commit948dbbbe0d75f1975a80eafd53d6b8daa8f92223 (patch)
tree1394f250b7657a7d39ee2b270c7a51281c30c692 /media/libstagefright/include/MPEG4Extractor.h
parent4123d6db0642cd13e69230705b12d6b6fee6f73f (diff)
parent8cfad968d5ec429b033caff9743f1ef15090be61 (diff)
downloadframeworks_av-948dbbbe0d75f1975a80eafd53d6b8daa8f92223.zip
frameworks_av-948dbbbe0d75f1975a80eafd53d6b8daa8f92223.tar.gz
frameworks_av-948dbbbe0d75f1975a80eafd53d6b8daa8f92223.tar.bz2
Merge "stagefright: metadata retriever changes for capture fps"
Diffstat (limited to 'media/libstagefright/include/MPEG4Extractor.h')
-rw-r--r--media/libstagefright/include/MPEG4Extractor.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/include/MPEG4Extractor.h b/media/libstagefright/include/MPEG4Extractor.h
index 8c16251..3067c3d 100644
--- a/media/libstagefright/include/MPEG4Extractor.h
+++ b/media/libstagefright/include/MPEG4Extractor.h
@@ -104,11 +104,15 @@ private:
String8 mLastCommentName;
String8 mLastCommentData;
+ KeyedVector<uint32_t, AString> mMetaKeyMap;
+
status_t readMetaData();
status_t parseChunk(off64_t *offset, int depth);
status_t parseITunesMetaData(off64_t offset, size_t size);
status_t parse3GPPMetaData(off64_t offset, size_t size, int depth);
void parseID3v2MetaData(off64_t offset);
+ status_t parseQTMetaKey(off64_t data_offset, size_t data_size);
+ status_t parseQTMetaVal(int32_t keyId, off64_t data_offset, size_t data_size);
status_t updateAudioTrackInfoFromESDS_MPEG4Audio(
const void *esds_data, size_t esds_size);