diff options
| author | Chong Zhang <chz@google.com> | 2015-04-15 01:32:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-15 01:32:25 +0000 |
| commit | be39e102a64f48fb3afe6ca412231f17df3c3c87 (patch) | |
| tree | cdcef473819021571445f55fb2059c71f2fe147e /include | |
| parent | 948dbbbe0d75f1975a80eafd53d6b8daa8f92223 (diff) | |
| parent | a0d0ba51ad60a68117a0ee78e37ab78715b8a069 (diff) | |
| download | frameworks_av-be39e102a64f48fb3afe6ca412231f17df3c3c87.zip frameworks_av-be39e102a64f48fb3afe6ca412231f17df3c3c87.tar.gz frameworks_av-be39e102a64f48fb3afe6ca412231f17df3c3c87.tar.bz2 | |
Merge "HLS: parse stream resolution and set maxWidth/maxHeight"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MetaData.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index b686787..8bdebf6 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -75,6 +75,8 @@ enum { kKeyDecoderComponent = 'decC', // cstring kKeyBufferID = 'bfID', kKeyMaxInputSize = 'inpS', + kKeyMaxWidth = 'maxW', + kKeyMaxHeight = 'maxH', kKeyThumbnailTime = 'thbT', // int64_t (usecs) kKeyTrackID = 'trID', kKeyIsDRM = 'idrm', // int32_t (bool) |