Fix alignment/sizing issues in the marshalling code for GraphicBuffer…

…s and Fences IGraphicBufferConsumer was non-functioning due to broken flattening/unflattening assumptions, as well as general alignment issues under ARM. Also, some size calculations for buffer Fences reported wrong values. This fix re-enables cross-process buffer Producer/Consumer communication. Change-Id: I1a0fb42ad28ac10e7c46f7f651dd331ca91ecf05 Signed-off-by: Ricardo Mendoza <[email protected]> Signed-off-by: Ondrej Kubik <[email protected]>
WhitestormJS · Nov 2, 2015 · fc4194e · fc4194e
1 parent 50f14f2
commit fc4194e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/libs/gui/IGraphicBufferConsumer.cpp b/libs/gui/IGraphicBufferConsumer.cpp
@@ -53,11 +53,11 @@ size_t IGraphicBufferConsumer::BufferItem::getPodSize() const {
             sizeof(mScalingMode) +
             sizeof(mTimestamp) +
             sizeof(mIsAutoTimestamp) +
-            sizeof(mFrameNumber) +
+            FlattenableUtils::align<4>(sizeof(mFrameNumber)) +
             sizeof(mBuf) +
-            sizeof(mIsDroppable) +
-            sizeof(mAcquireCalled) +
-            sizeof(mTransformToDisplayInverse);
+            FlattenableUtils::align<4>(sizeof(mIsDroppable)) +
+            FlattenableUtils::align<4>(sizeof(mAcquireCalled)) +
+            FlattenableUtils::align<4>(sizeof(mTransformToDisplayInverse));
     return c;
 }
 
@@ -133,11 +133,15 @@ status_t IGraphicBufferConsumer::BufferItem::flatten(
     FlattenableUtils::write(buffer, size, mScalingMode);
     FlattenableUtils::write(buffer, size, mTimestamp);
     writeBoolAsInt(buffer, size, mIsAutoTimestamp);
+    size -= FlattenableUtils::align<4>(buffer);
     FlattenableUtils::write(buffer, size, mFrameNumber);
     FlattenableUtils::write(buffer, size, mBuf);
     writeBoolAsInt(buffer, size, mIsDroppable);
+    size -= FlattenableUtils::align<4>(buffer);
     writeBoolAsInt(buffer, size, mAcquireCalled);
+    size -= FlattenableUtils::align<4>(buffer);
     writeBoolAsInt(buffer, size, mTransformToDisplayInverse);
+    size -= FlattenableUtils::align<4>(buffer);
 
     return NO_ERROR;
 }
@@ -149,7 +153,7 @@ status_t IGraphicBufferConsumer::BufferItem::unflatten(
         return NO_MEMORY;
 
     uint32_t flags = 0;
-    FlattenableUtils::read(buffer, size, flags);
+    FlattenableUtils::read<uint32_t>(buffer, size, flags);
 
     if (flags & 1) {
         mGraphicBuffer = new GraphicBuffer();
@@ -175,11 +179,15 @@ status_t IGraphicBufferConsumer::BufferItem::unflatten(
     FlattenableUtils::read(buffer, size, mScalingMode);
     FlattenableUtils::read(buffer, size, mTimestamp);
     mIsAutoTimestamp = readBoolFromInt(buffer, size);
+    size -= FlattenableUtils::align<4>(buffer);
     FlattenableUtils::read(buffer, size, mFrameNumber);
     FlattenableUtils::read(buffer, size, mBuf);
     mIsDroppable = readBoolFromInt(buffer, size);
+    size -= FlattenableUtils::align<4>(buffer);
     mAcquireCalled = readBoolFromInt(buffer, size);
+    size -= FlattenableUtils::align<4>(buffer);
     mTransformToDisplayInverse = readBoolFromInt(buffer, size);
+    size -= FlattenableUtils::align<4>(buffer);
 
     return NO_ERROR;
 }

diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp
@@ -127,7 +127,7 @@ nsecs_t Fence::getSignalTime() const {
 }
 
 size_t Fence::getFlattenedSize() const {
-    return 1;
+    return sizeof(getFdCount());
 }
 
 size_t Fence::getFdCount() const {

diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp
@@ -323,7 +323,7 @@ status_t GraphicBuffer::flatten(void*& buffer, size_t& size, int*& fds, size_t&
         memcpy(&buf[10], h->data + h->numFds, h->numInts*sizeof(int));
     }
 
-    buffer = reinterpret_cast<void*>(static_cast<int*>(buffer) + sizeNeeded);
+    buffer = reinterpret_cast<void*>(static_cast<int*>(buffer + sizeNeeded));
     size -= sizeNeeded;
     if (handle) {
         fds += handle->numFds;
@@ -404,7 +404,7 @@ status_t GraphicBuffer::unflatten(
         }
     }
 
-    buffer = reinterpret_cast<void const*>(static_cast<int const*>(buffer) + sizeNeeded);
+    buffer = reinterpret_cast<void const*>(static_cast<int const*>(buffer + sizeNeeded));
     size -= sizeNeeded;
     fds += numFds;
     count -= numFds;