diff options
| author | James Dong <jdong@google.com> | 2011-01-19 10:06:23 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-19 10:06:23 -0800 |
| commit | a5939efeaf8be373ee71941466ad5a2db1750881 (patch) | |
| tree | 608b74b25dd64936ede778ea8449c21d7683e14e /include | |
| parent | aa46ce8ac441981ecbf9e72fb4acc6677615efc9 (diff) | |
| parent | e75ceba6e3f009118c5debbbe2de268beb350c9a (diff) | |
| download | frameworks_av-a5939efeaf8be373ee71941466ad5a2db1750881.zip frameworks_av-a5939efeaf8be373ee71941466ad5a2db1750881.tar.gz frameworks_av-a5939efeaf8be373ee71941466ad5a2db1750881.tar.bz2 | |
am 4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
* commit '4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18':
Fix the presentation video resolution when it is different from the actual image resolution of the video.
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', |