diff options
| author | Chong Zhang <chz@google.com> | 2015-04-14 22:28:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-14 22:28:27 +0000 |
| commit | 948dbbbe0d75f1975a80eafd53d6b8daa8f92223 (patch) | |
| tree | 1394f250b7657a7d39ee2b270c7a51281c30c692 /include | |
| parent | 4123d6db0642cd13e69230705b12d6b6fee6f73f (diff) | |
| parent | 8cfad968d5ec429b033caff9743f1ef15090be61 (diff) | |
| download | frameworks_av-948dbbbe0d75f1975a80eafd53d6b8daa8f92223.zip frameworks_av-948dbbbe0d75f1975a80eafd53d6b8daa8f92223.tar.gz frameworks_av-948dbbbe0d75f1975a80eafd53d6b8daa8f92223.tar.bz2 | |
Merge "stagefright: metadata retriever changes for capture fps"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/mediametadataretriever.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/media/mediametadataretriever.h b/include/media/mediametadataretriever.h index b35cf32..7191965 100644 --- a/include/media/mediametadataretriever.h +++ b/include/media/mediametadataretriever.h @@ -57,6 +57,7 @@ enum { METADATA_KEY_IS_DRM = 22, METADATA_KEY_LOCATION = 23, METADATA_KEY_VIDEO_ROTATION = 24, + METADATA_KEY_CAPTURE_FRAMERATE = 25, // Add more here... }; diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 087d016..b686787 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -98,6 +98,7 @@ enum { kKeyCompilation = 'cpil', // cstring kKeyLocation = 'loc ', // cstring kKeyTimeScale = 'tmsl', // int32_t + kKeyCaptureFramerate = 'capF', // float (capture fps) // video profile and level kKeyVideoProfile = 'vprf', // int32_t |