diff options
| author | James Dong <jdong@google.com> | 2011-01-19 10:09:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-19 10:09:01 -0800 |
| commit | a2a3ea5ddadd7e3c882a93906b90e60231735818 (patch) | |
| tree | 7462b85b2c038961c672eef0c7294679991279ef /include | |
| parent | e944c0fe027d98d10d551f133aae0fb53e3f6b35 (diff) | |
| parent | 1324e3b1a4246f77d516b37fa98013ffad91268e (diff) | |
| download | frameworks_base-a2a3ea5ddadd7e3c882a93906b90e60231735818.zip frameworks_base-a2a3ea5ddadd7e3c882a93906b90e60231735818.tar.gz frameworks_base-a2a3ea5ddadd7e3c882a93906b90e60231735818.tar.bz2 | |
am 1324e3b1: am 4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
* commit '1324e3b1a4246f77d516b37fa98013ffad91268e':
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', |