diff options
| author | Chong Zhang <chz@google.com> | 2015-05-22 19:04:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-22 19:04:05 +0000 |
| commit | 041b945e07168712fd4d2fec06f76aeaeaa5fc9e (patch) | |
| tree | b622ec7c9a9f82ba6275e822baa0839c080b5249 /include | |
| parent | 217a04bab40ef5b99d5581878d903a6e6aa8b547 (diff) | |
| parent | 47f674dfeca31b29810ecb90f1277918b67c4cf8 (diff) | |
| download | frameworks_native-041b945e07168712fd4d2fec06f76aeaeaa5fc9e.zip frameworks_native-041b945e07168712fd4d2fec06f76aeaeaa5fc9e.tar.gz frameworks_native-041b945e07168712fd4d2fec06f76aeaeaa5fc9e.tar.bz2 | |
Merge "fix BufferItem flatten/unflatten alignment" into mnc-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/gui/BufferItem.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/gui/BufferItem.h b/include/gui/BufferItem.h index 000ef0e..145efe6 100644 --- a/include/gui/BufferItem.h +++ b/include/gui/BufferItem.h @@ -72,7 +72,13 @@ class BufferItem : public Flattenable<BufferItem> { // to set by queueBuffer each time this slot is queued. This value // is guaranteed to be monotonically increasing for each newly // acquired buffer. - int64_t mTimestamp; + union { + int64_t mTimestamp; + struct { + uint32_t mTimestampLo; + uint32_t mTimestampHi; + }; + }; // mIsAutoTimestamp indicates whether mTimestamp was generated // automatically when the buffer was queued. @@ -84,7 +90,13 @@ class BufferItem : public Flattenable<BufferItem> { android_dataspace mDataSpace; // mFrameNumber is the number of the queued frame for this slot. - uint64_t mFrameNumber; + union { + uint64_t mFrameNumber; + struct { + uint32_t mFrameNumberLo; + uint32_t mFrameNumberHi; + }; + }; union { // mSlot is the slot index of this buffer (default INVALID_BUFFER_SLOT). |