diff options
author | Chong Zhang <chz@google.com> | 2015-05-22 19:28:01 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-22 19:28:01 +0000 |
commit | edf76b625866aa940841acaa67dbc0fd5409b991 (patch) | |
tree | f2fe48a4eccf288e95fc312ec44d0898add7389b /include | |
parent | 5f1dfc11b431df7d64e9e568a84c5f0f7e5dd660 (diff) | |
parent | 041b945e07168712fd4d2fec06f76aeaeaa5fc9e (diff) | |
download | frameworks_native-edf76b625866aa940841acaa67dbc0fd5409b991.zip frameworks_native-edf76b625866aa940841acaa67dbc0fd5409b991.tar.gz frameworks_native-edf76b625866aa940841acaa67dbc0fd5409b991.tar.bz2 |
am 041b945e: Merge "fix BufferItem flatten/unflatten alignment" into mnc-dev
* commit '041b945e07168712fd4d2fec06f76aeaeaa5fc9e':
fix BufferItem flatten/unflatten alignment
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). |