diff options
author | Mathias Agopian <mathias@google.com> | 2010-02-11 17:30:52 -0800 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2010-02-21 23:27:25 -0800 |
commit | 98e71ddaede9a0bfb681fd237bec1f66c6c53193 (patch) | |
tree | b99491347832c92e1e5af62d11d3a9baf946dd18 /libs/ui | |
parent | e4f5055ad281096e5b89c4240be29d2c95a43b65 (diff) | |
download | frameworks_native-98e71ddaede9a0bfb681fd237bec1f66c6c53193.zip frameworks_native-98e71ddaede9a0bfb681fd237bec1f66c6c53193.tar.gz frameworks_native-98e71ddaede9a0bfb681fd237bec1f66c6c53193.tar.bz2 |
remove a dependency of GraphicBuffer (libui) on Parcel (libbinder).
Add a Flattenable interface to libutils which can be used to flatten
an object into bytestream + filedescriptor stream.
Parcel is modified to handle Flattenable. And GraphicBuffer implements
Flattenable.
Except for the overlay classes libui is now independent of libbinder.
Diffstat (limited to 'libs/ui')
-rw-r--r-- | libs/ui/GraphicBuffer.cpp | 125 |
1 files changed, 83 insertions, 42 deletions
diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp index 6a5c8a9..ba1fd9c 100644 --- a/libs/ui/GraphicBuffer.cpp +++ b/libs/ui/GraphicBuffer.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ +#define LOG_TAG "GraphicBuffer" + #include <stdlib.h> #include <stdint.h> #include <sys/types.h> -#include <binder/Parcel.h> - #include <utils/Errors.h> #include <utils/Log.h> @@ -77,34 +77,21 @@ GraphicBuffer::GraphicBuffer(uint32_t w, uint32_t h, handle = inHandle; } -GraphicBuffer::GraphicBuffer(const Parcel& data) - : BASE(), mOwner(ownHandle), mBufferMapper(GraphicBufferMapper::get()), - mInitCheck(NO_ERROR), mVStride(0), mIndex(-1) +GraphicBuffer::~GraphicBuffer() { - // we own the handle in this case - width = data.readInt32(); - if (width < 0) { - width = height = stride = format = usage = 0; - handle = 0; - } else { - height = data.readInt32(); - stride = data.readInt32(); - format = data.readInt32(); - usage = data.readInt32(); - handle = data.readNativeHandle(); + if (handle) { + free_handle(); } } -GraphicBuffer::~GraphicBuffer() +void GraphicBuffer::free_handle() { - if (handle) { - if (mOwner == ownHandle) { - native_handle_close(handle); - native_handle_delete(const_cast<native_handle*>(handle)); - } else if (mOwner == ownData) { - GraphicBufferAllocator& allocator(GraphicBufferAllocator::get()); - allocator.free(handle); - } + if (mOwner == ownHandle) { + native_handle_close(handle); + native_handle_delete(const_cast<native_handle*>(handle)); + } else if (mOwner == ownData) { + GraphicBufferAllocator& allocator(GraphicBufferAllocator::get()); + allocator.free(handle); } } @@ -192,29 +179,83 @@ status_t GraphicBuffer::lock(GGLSurface* sur, uint32_t usage) return res; } +size_t GraphicBuffer::getFlattenedSize() const { + return (8 + (handle ? handle->numInts : 0))*sizeof(int); +} + +size_t GraphicBuffer::getFdCount() const { + return handle ? handle->numFds : 0; +} -status_t GraphicBuffer::writeToParcel(Parcel* reply, - android_native_buffer_t const* buffer) +status_t GraphicBuffer::flatten(void* buffer, size_t size, + int fds[], size_t count) const { - if (buffer == NULL) - return BAD_VALUE; + size_t sizeNeeded = GraphicBuffer::getFlattenedSize(); + if (size < sizeNeeded) return NO_MEMORY; + + size_t fdCountNeeded = GraphicBuffer::getFdCount(); + if (count < fdCountNeeded) return NO_MEMORY; + + int* buf = static_cast<int*>(buffer); + buf[0] = 'GBFR'; + buf[1] = width; + buf[2] = height; + buf[3] = stride; + buf[4] = format; + buf[5] = usage; + buf[6] = 0; + buf[7] = 0; - if (buffer->width < 0 || buffer->height < 0) - return BAD_VALUE; + if (handle) { + buf[6] = handle->numFds; + buf[7] = handle->numInts; + native_handle_t const* const h = handle; + memcpy(fds, h->data, h->numFds*sizeof(int)); + memcpy(&buf[8], h->data + h->numFds, h->numInts*sizeof(int)); + } + + return NO_ERROR; +} + +status_t GraphicBuffer::unflatten(void const* buffer, size_t size, + int fds[], size_t count) +{ + if (size < 8*sizeof(int)) return NO_MEMORY; + + int const* buf = static_cast<int const*>(buffer); + if (buf[0] != 'GBFR') return BAD_TYPE; + + const size_t numFds = buf[6]; + const size_t numInts = buf[7]; - status_t err = NO_ERROR; - if (buffer->handle == NULL) { - // this buffer doesn't have a handle - reply->writeInt32(NO_MEMORY); + const size_t sizeNeeded = (8 + numInts) * sizeof(int); + if (size < sizeNeeded) return NO_MEMORY; + + size_t fdCountNeeded = 0; + if (count < fdCountNeeded) return NO_MEMORY; + + if (handle) { + // free previous handle if any + free_handle(); + } + + if (numFds || numInts) { + width = buf[1]; + height = buf[2]; + stride = buf[3]; + format = buf[4]; + usage = buf[5]; + native_handle* h = native_handle_create(numFds, numInts); + memcpy(h->data, fds, numFds*sizeof(int)); + memcpy(h->data + numFds, &buf[8], numInts*sizeof(int)); + handle = h; } else { - reply->writeInt32(buffer->width); - reply->writeInt32(buffer->height); - reply->writeInt32(buffer->stride); - reply->writeInt32(buffer->format); - reply->writeInt32(buffer->usage); - err = reply->writeNativeHandle(buffer->handle); + width = height = stride = format = usage = 0; + handle = NULL; } - return err; + + mOwner = ownHandle; + return NO_ERROR; } |