diff options
| author | James Dong <jdong@google.com> | 2011-01-19 10:05:05 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-19 10:05:05 -0800 |
| commit | 4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18 (patch) | |
| tree | 3421849c10d4b32a5557c71cdce6b18e6adfbe92 /include | |
| parent | 2597aedb3869e46f945359c529e03263c77a944d (diff) | |
| parent | 08adfd29ae3634b554cfe184ab82f112ef934d7b (diff) | |
| download | frameworks_base-4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18.zip frameworks_base-4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18.tar.gz frameworks_base-4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18.tar.bz2 | |
Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MetaData.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 5170a2c..18fd90e 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -30,8 +30,10 @@ namespace android { // The following keys map to int32_t data unless indicated otherwise. enum { kKeyMIMEType = 'mime', // cstring - kKeyWidth = 'widt', // int32_t - kKeyHeight = 'heig', // int32_t + kKeyWidth = 'widt', // int32_t, image pixel + kKeyHeight = 'heig', // int32_t, image pixel + kKeyDisplayWidth = 'dWid', // int32_t, display/presentation + kKeyDisplayHeight = 'dHgt', // int32_t, display/presentation // a rectangle, if absent assumed to be (0, 0, width - 1, height - 1) kKeyCropRect = 'crop', |