ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "fix BufferItem flatten/unflatten alignment"

Browse Source
This commit is contained in:
Dan Stoza 2015-05-28 20:51:55 +00:00 committed by Gerrit Code Review
commit 10cb68fb97
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/gui/BufferItem.h
View File

@ -72,7 +72,13 @@ class BufferItem : public Flattenable<BufferItem> {
// to set by queueBuffer each time this slot is queued. This value // to set by queueBuffer each time this slot is queued. This value
// is guaranteed to be monotonically increasing for each newly // is guaranteed to be monotonically increasing for each newly
// acquired buffer. // acquired buffer.
union {
int64_t mTimestamp; int64_t mTimestamp;
struct {
uint32_t mTimestampLo;
uint32_t mTimestampHi;
};
};
// mIsAutoTimestamp indicates whether mTimestamp was generated // mIsAutoTimestamp indicates whether mTimestamp was generated
// automatically when the buffer was queued. // automatically when the buffer was queued.
@ -84,7 +90,13 @@ class BufferItem : public Flattenable<BufferItem> {
android_dataspace mDataSpace; android_dataspace mDataSpace;
// mFrameNumber is the number of the queued frame for this slot. // mFrameNumber is the number of the queued frame for this slot.
union {
uint64_t mFrameNumber; uint64_t mFrameNumber;
struct {
uint32_t mFrameNumberLo;
uint32_t mFrameNumberHi;
};
};
union { union {
// mSlot is the slot index of this buffer (default INVALID_BUFFER_SLOT). // mSlot is the slot index of this buffer (default INVALID_BUFFER_SLOT).

25
libs/gui/BufferItem.cpp
View File

@ -46,15 +46,16 @@ static void addAligned(size_t& size, T /* value */) {
} }
size_t BufferItem::getPodSize() const { size_t BufferItem::getPodSize() const {
// Must align<8> before writing these fields for this to be correct
size_t size = 0; size_t size = 0;
addAligned(size, mCrop); addAligned(size, mCrop);
addAligned(size, mTransform); addAligned(size, mTransform);
addAligned(size, mScalingMode); addAligned(size, mScalingMode);
addAligned(size, mTimestamp); addAligned(size, mTimestampLo);
addAligned(size, mTimestampHi);
addAligned(size, mIsAutoTimestamp); addAligned(size, mIsAutoTimestamp);
addAligned(size, mDataSpace); addAligned(size, mDataSpace);
addAligned(size, mFrameNumber); addAligned(size, mFrameNumberLo);
addAligned(size, mFrameNumberHi);
addAligned(size, mSlot); addAligned(size, mSlot);
addAligned(size, mIsDroppable); addAligned(size, mIsDroppable);
addAligned(size, mAcquireCalled); addAligned(size, mAcquireCalled);
@ -126,9 +127,6 @@ status_t BufferItem::flatten(
if (err) return err; if (err) return err;
FlattenableUtils::advance(buffer, size, mSurfaceDamage.getFlattenedSize()); FlattenableUtils::advance(buffer, size, mSurfaceDamage.getFlattenedSize());
// Must align<8> so that getPodSize returns the correct value
size -= FlattenableUtils::align<8>(buffer);
// Check we still have enough space // Check we still have enough space
if (size < getPodSize()) { if (size < getPodSize()) {
return NO_MEMORY; return NO_MEMORY;
@ -137,10 +135,12 @@ status_t BufferItem::flatten(
writeAligned(buffer, size, mCrop); writeAligned(buffer, size, mCrop);
writeAligned(buffer, size, mTransform); writeAligned(buffer, size, mTransform);
writeAligned(buffer, size, mScalingMode); writeAligned(buffer, size, mScalingMode);
writeAligned(buffer, size, mTimestamp); writeAligned(buffer, size, mTimestampLo);
writeAligned(buffer, size, mTimestampHi);
writeAligned(buffer, size, mIsAutoTimestamp); writeAligned(buffer, size, mIsAutoTimestamp);
writeAligned(buffer, size, mDataSpace); writeAligned(buffer, size, mDataSpace);
writeAligned(buffer, size, mFrameNumber); writeAligned(buffer, size, mFrameNumberLo);
writeAligned(buffer, size, mFrameNumberHi);
writeAligned(buffer, size, mSlot); writeAligned(buffer, size, mSlot);
writeAligned(buffer, size, mIsDroppable); writeAligned(buffer, size, mIsDroppable);
writeAligned(buffer, size, mAcquireCalled); writeAligned(buffer, size, mAcquireCalled);
@ -183,9 +183,6 @@ status_t BufferItem::unflatten(
if (err) return err; if (err) return err;
FlattenableUtils::advance(buffer, size, mSurfaceDamage.getFlattenedSize()); FlattenableUtils::advance(buffer, size, mSurfaceDamage.getFlattenedSize());
// Must align<8> so that getPodSize returns the correct value
size -= FlattenableUtils::align<8>(buffer);
// Check we still have enough space // Check we still have enough space
if (size < getPodSize()) { if (size < getPodSize()) {
return NO_MEMORY; return NO_MEMORY;
@ -194,10 +191,12 @@ status_t BufferItem::unflatten(
readAligned(buffer, size, mCrop); readAligned(buffer, size, mCrop);
readAligned(buffer, size, mTransform); readAligned(buffer, size, mTransform);
readAligned(buffer, size, mScalingMode); readAligned(buffer, size, mScalingMode);
readAligned(buffer, size, mTimestamp); readAligned(buffer, size, mTimestampLo);
readAligned(buffer, size, mTimestampHi);
readAligned(buffer, size, mIsAutoTimestamp); readAligned(buffer, size, mIsAutoTimestamp);
readAligned(buffer, size, mDataSpace); readAligned(buffer, size, mDataSpace);
readAligned(buffer, size, mFrameNumber); readAligned(buffer, size, mFrameNumberLo);
readAligned(buffer, size, mFrameNumberHi);
readAligned(buffer, size, mSlot); readAligned(buffer, size, mSlot);
readAligned(buffer, size, mIsDroppable); readAligned(buffer, size, mIsDroppable);
readAligned(buffer, size, mAcquireCalled); readAligned(buffer, size, mAcquireCalled);