libshims: Clean up shim ui and reorganize other shims

3 files changed, 86 insertions, 462 deletions

diff --git a/mtk/libshims/Android.mk b/mtk/libshims/Android.mk
index 0235615..50043f3 100644
--- a/mtk/libshims/Android.mk
+++ b/mtk/libshims/Android.mk
@@ -1,27 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
-## libshim_ui
+# libshim_gui
 include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    ui/mtk_ui.cpp \
-    ui/GraphicBuffer.cpp
-
-LOCAL_SHARED_LIBRARIES := libbinder libui liblog libutils libcutils
-LOCAL_MODULE := libshim_ui
-
-LOCAL_C_INCLUDES := \
-    frameworks/native/include \
-    system/core/libutils
-
-LOCAL_CFLAGS := -O3 -Wno-unused-variable -Wno-unused-parameter
-LOCAL_PROPRIETARY_MODULE := true
-include $(BUILD_SHARED_LIBRARY)
-
-
-## libshim_gui
-include $(CLEAR_VARS)
-
 LOCAL_SRC_FILES := \
     gui/mtk_gui.cpp \
     gui/SensorManager.cpp
@@ -32,26 +12,30 @@ LOCAL_CFLAGS := -O3 -Wno-unused-variable -Wno-unused-parameter
 LOCAL_PROPRIETARY_MODULE := true
 include $(BUILD_SHARED_LIBRARY)
 
-
-## libshim_snd
+# libshim_snd
 include $(CLEAR_VARS)
-
 LOCAL_SRC_FILES := audio/mtk_audio.cpp
-
 LOCAL_SHARED_LIBRARIES := libbinder libmedia
 LOCAL_MODULE := libshim_snd
 LOCAL_CFLAGS := -O3 -Wno-unused-variable -Wno-unused-parameter
 LOCAL_PROPRIETARY_MODULE := true
 include $(BUILD_SHARED_LIBRARY)
 
-
-## libshim_xlog
+# libshim_ui
 include $(CLEAR_VARS)
+LOCAL_SRC_FILES := ui/mtk_ui.cpp
+LOCAL_SHARED_LIBRARIES := libbinder libui libutils
+LOCAL_MODULE := libshim_ui
+LOCAL_C_INCLUDES := frameworks/native/include
+LOCAL_CFLAGS := -O3 -Wno-unused-variable -Wno-unused-parameter
+LOCAL_PROPRIETARY_MODULE := true
+include $(BUILD_SHARED_LIBRARY)
 
+# libshim_xlog
+include $(CLEAR_VARS)
 LOCAL_SRC_FILES := xlog.c
-
 LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_MODULE := libshim_xlog
 LOCAL_CFLAGS := -O3 -Wno-unused-variable -Wno-unused-parameter
 LOCAL_PROPRIETARY_MODULE := true
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/mtk/libshims/ui/GraphicBuffer.cpp b/mtk/libshims/ui/GraphicBuffer.cpp
deleted file mode 100644
index c264f51..0000000
--- a/mtk/libshims/ui/GraphicBuffer.cpp
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "GraphicBuffer"
-
-#include <stdlib.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <utils/Errors.h>
-#include <utils/Log.h>
-
-#include "GraphicBuffer.h"
-#include <ui/GraphicBufferAllocator.h>
-#include <ui/GraphicBufferMapper.h>
-#include <ui/PixelFormat.h>
-
-namespace android {
-
-// ===========================================================================
-// Buffer and implementation of ANativeWindowBuffer
-// ===========================================================================
-
-static uint64_t getUniqueId() {
-    static volatile int32_t nextId = 0;
-    uint64_t id = static_cast<uint64_t>(getpid()) << 32;
-    id |= static_cast<uint32_t>(android_atomic_inc(&nextId));
-    return id;
-}
-
-GraphicBuffer::GraphicBuffer()
-    : BASE(), mOwner(ownData), mBufferMapper(GraphicBufferMapper::get()),
-      mInitCheck(NO_ERROR), mId(getUniqueId()), mGenerationNumber(0)
-{
-    width  =
-    height =
-    stride =
-    format =
-    usage  = 0;
-    handle = NULL;
-}
-
-GraphicBuffer::GraphicBuffer(uint32_t inWidth, uint32_t inHeight,
-        PixelFormat inFormat, uint32_t inUsage)
-    : BASE(), mOwner(ownData), mBufferMapper(GraphicBufferMapper::get()),
-      mInitCheck(NO_ERROR), mId(getUniqueId()), mGenerationNumber(0)
-{
-    width  =
-    height =
-    stride =
-    format =
-    usage  = 0;
-    handle = NULL;
-    mInitCheck = initSize(inWidth, inHeight, inFormat, inUsage, "<Unknown>");
-}
-
-GraphicBuffer::GraphicBuffer(uint32_t inWidth, uint32_t inHeight,
-        PixelFormat inFormat, uint32_t inUsage, std::string requestorName)
-    : BASE(), mOwner(ownData), mBufferMapper(GraphicBufferMapper::get()),
-      mInitCheck(NO_ERROR), mId(getUniqueId()), mGenerationNumber(0)
-{
-    width  =
-    height =
-    stride =
-    format =
-    usage  = 0;
-    handle = NULL;
-    mInitCheck = initSize(inWidth, inHeight, inFormat, inUsage,
-            std::move(requestorName));
-}
-
-GraphicBuffer::GraphicBuffer(uint32_t inWidth, uint32_t inHeight,
-        PixelFormat inFormat, uint32_t inUsage, uint32_t inStride,
-        native_handle_t* inHandle, bool keepOwnership)
-    : BASE(), mOwner(keepOwnership ? ownHandle : ownNone),
-      mBufferMapper(GraphicBufferMapper::get()),
-      mInitCheck(NO_ERROR), mId(getUniqueId()), mGenerationNumber(0)
-{
-    width  = static_cast<int>(inWidth);
-    height = static_cast<int>(inHeight);
-    stride = static_cast<int>(inStride);
-    format = inFormat;
-    usage  = static_cast<int>(inUsage);
-    handle = inHandle;
-}
-
-GraphicBuffer::GraphicBuffer(ANativeWindowBuffer* buffer, bool keepOwnership)
-    : BASE(), mOwner(keepOwnership ? ownHandle : ownNone),
-      mBufferMapper(GraphicBufferMapper::get()),
-      mInitCheck(NO_ERROR), mWrappedBuffer(buffer), mId(getUniqueId()),
-      mGenerationNumber(0)
-{
-    width  = buffer->width;
-    height = buffer->height;
-    stride = buffer->stride;
-    format = buffer->format;
-    usage  = buffer->usage;
-    handle = buffer->handle;
-}
-
-GraphicBuffer::~GraphicBuffer()
-{
-    if (handle) {
-        free_handle();
-    }
-}
-
-void GraphicBuffer::free_handle()
-{
-    if (mOwner == ownHandle) {
-        mBufferMapper.unregisterBuffer(handle);
-        native_handle_close(handle);
-        native_handle_delete(const_cast<native_handle*>(handle));
-    } else if (mOwner == ownData) {
-        GraphicBufferAllocator& allocator(GraphicBufferAllocator::get());
-        allocator.free(handle);
-    }
-
-#ifndef EGL_NEEDS_HANDLE
-    handle = NULL;
-#endif
-
-    mWrappedBuffer = 0;
-}
-
-status_t GraphicBuffer::initCheck() const {
-    return static_cast<status_t>(mInitCheck);
-}
-
-void GraphicBuffer::dumpAllocationsToSystemLog()
-{
-    GraphicBufferAllocator::dumpToSystemLog();
-}
-
-ANativeWindowBuffer* GraphicBuffer::getNativeBuffer() const
-{
-    LOG_ALWAYS_FATAL_IF(this == NULL, "getNativeBuffer() called on NULL GraphicBuffer");
-    return static_cast<ANativeWindowBuffer*>(
-            const_cast<GraphicBuffer*>(this));
-}
-
-status_t GraphicBuffer::reallocate(uint32_t inWidth, uint32_t inHeight,
-        PixelFormat inFormat, uint32_t inUsage)
-{
-    if (mOwner != ownData)
-        return INVALID_OPERATION;
-
-    if (handle &&
-            static_cast<int>(inWidth) == width &&
-            static_cast<int>(inHeight) == height &&
-            inFormat == format &&
-            static_cast<int>(inUsage) == usage)
-        return NO_ERROR;
-
-    if (handle) {
-        GraphicBufferAllocator& allocator(GraphicBufferAllocator::get());
-        allocator.free(handle);
-        handle = 0;
-    }
-    return initSize(inWidth, inHeight, inFormat, inUsage, "[Reallocation]");
-}
-
-bool GraphicBuffer::needsReallocation(uint32_t inWidth, uint32_t inHeight,
-        PixelFormat inFormat, uint32_t inUsage)
-{
-    if (static_cast<int>(inWidth) != width) return true;
-    if (static_cast<int>(inHeight) != height) return true;
-    if (inFormat != format) return true;
-    if ((static_cast<uint32_t>(usage) & inUsage) != inUsage) return true;
-    return false;
-}
-
-status_t GraphicBuffer::initSize(uint32_t inWidth, uint32_t inHeight,
-        PixelFormat inFormat, uint32_t inUsage, std::string requestorName)
-{
-    GraphicBufferAllocator& allocator = GraphicBufferAllocator::get();
-    uint32_t outStride = 0;
-    status_t err = allocator.allocate(inWidth, inHeight, inFormat, inUsage,
-            &handle, &outStride, mId, std::move(requestorName));
-    if (err == NO_ERROR) {
-        width = static_cast<int>(inWidth);
-        height = static_cast<int>(inHeight);
-        format = inFormat;
-        usage = static_cast<int>(inUsage);
-        stride = static_cast<int>(outStride);
-    }
-    return err;
-}
-
-status_t GraphicBuffer::lock(uint32_t inUsage, void** vaddr)
-{
-    const Rect lockBounds(width, height);
-    status_t res = lock(inUsage, lockBounds, vaddr);
-    return res;
-}
-
-status_t GraphicBuffer::lock(uint32_t inUsage, const Rect& rect, void** vaddr)
-{
-    if (rect.left < 0 || rect.right  > width ||
-        rect.top  < 0 || rect.bottom > height) {
-        ALOGE("locking pixels (%d,%d,%d,%d) outside of buffer (w=%d, h=%d)",
-                rect.left, rect.top, rect.right, rect.bottom,
-                width, height);
-        return BAD_VALUE;
-    }
-    status_t res = getBufferMapper().lock(handle, inUsage, rect, vaddr);
-    return res;
-}
-
-status_t GraphicBuffer::lockYCbCr(uint32_t inUsage, android_ycbcr* ycbcr)
-{
-    const Rect lockBounds(width, height);
-    status_t res = lockYCbCr(inUsage, lockBounds, ycbcr);
-    return res;
-}
-
-status_t GraphicBuffer::lockYCbCr(uint32_t inUsage, const Rect& rect,
-        android_ycbcr* ycbcr)
-{
-    if (rect.left < 0 || rect.right  > width ||
-        rect.top  < 0 || rect.bottom > height) {
-        ALOGE("locking pixels (%d,%d,%d,%d) outside of buffer (w=%d, h=%d)",
-                rect.left, rect.top, rect.right, rect.bottom,
-                width, height);
-        return BAD_VALUE;
-    }
-    status_t res = getBufferMapper().lockYCbCr(handle, inUsage, rect, ycbcr);
-    return res;
-}
-
-status_t GraphicBuffer::unlock()
-{
-    status_t res = getBufferMapper().unlock(handle);
-    return res;
-}
-
-status_t GraphicBuffer::lockAsync(uint32_t inUsage, void** vaddr, int fenceFd)
-{
-    const Rect lockBounds(width, height);
-    status_t res = lockAsync(inUsage, lockBounds, vaddr, fenceFd);
-    return res;
-}
-
-status_t GraphicBuffer::lockAsync(uint32_t inUsage, const Rect& rect,
-        void** vaddr, int fenceFd)
-{
-    if (rect.left < 0 || rect.right  > width ||
-        rect.top  < 0 || rect.bottom > height) {
-        ALOGE("locking pixels (%d,%d,%d,%d) outside of buffer (w=%d, h=%d)",
-                rect.left, rect.top, rect.right, rect.bottom,
-                width, height);
-        return BAD_VALUE;
-    }
-    status_t res = getBufferMapper().lockAsync(handle, inUsage, rect, vaddr,
-            fenceFd);
-    return res;
-}
-
-status_t GraphicBuffer::lockAsyncYCbCr(uint32_t inUsage, android_ycbcr* ycbcr,
-        int fenceFd)
-{
-    const Rect lockBounds(width, height);
-    status_t res = lockAsyncYCbCr(inUsage, lockBounds, ycbcr, fenceFd);
-    return res;
-}
-
-status_t GraphicBuffer::lockAsyncYCbCr(uint32_t inUsage, const Rect& rect,
-        android_ycbcr* ycbcr, int fenceFd)
-{
-    if (rect.left < 0 || rect.right  > width ||
-        rect.top  < 0 || rect.bottom > height) {
-        ALOGE("locking pixels (%d,%d,%d,%d) outside of buffer (w=%d, h=%d)",
-                rect.left, rect.top, rect.right, rect.bottom,
-                width, height);
-        return BAD_VALUE;
-    }
-    status_t res = getBufferMapper().lockAsyncYCbCr(handle, inUsage, rect,
-            ycbcr, fenceFd);
-    return res;
-}
-
-status_t GraphicBuffer::unlockAsync(int *fenceFd)
-{
-    status_t res = getBufferMapper().unlockAsync(handle, fenceFd);
-    return res;
-}
-
-size_t GraphicBuffer::getFlattenedSize() const {
-    return static_cast<size_t>(11 + (handle ? handle->numInts : 0)) * sizeof(int);
-}
-
-size_t GraphicBuffer::getFdCount() const {
-    return static_cast<size_t>(handle ? handle->numFds : 0);
-}
-
-status_t GraphicBuffer::flatten(void*& buffer, size_t& size, int*& fds, size_t& count) const {
-    size_t sizeNeeded = GraphicBuffer::getFlattenedSize();
-    if (size < sizeNeeded) return NO_MEMORY;
-
-    size_t fdCountNeeded = GraphicBuffer::getFdCount();
-    if (count < fdCountNeeded) return NO_MEMORY;
-
-    int32_t* buf = static_cast<int32_t*>(buffer);
-    buf[0] = 'GBFR';
-    buf[1] = width;
-    buf[2] = height;
-    buf[3] = stride;
-    buf[4] = format;
-    buf[5] = usage;
-    buf[6] = static_cast<int32_t>(mId >> 32);
-    buf[7] = static_cast<int32_t>(mId & 0xFFFFFFFFull);
-    buf[8] = static_cast<int32_t>(mGenerationNumber);
-    buf[9] = 0;
-    buf[10] = 0;
-
-    if (handle) {
-        buf[9] = handle->numFds;
-        buf[10] = handle->numInts;
-        memcpy(fds, handle->data,
-                static_cast<size_t>(handle->numFds) * sizeof(int));
-        memcpy(&buf[11], handle->data + handle->numFds,
-                static_cast<size_t>(handle->numInts) * sizeof(int));
-    }
-
-    buffer = static_cast<void*>(static_cast<uint8_t*>(buffer) + sizeNeeded);
-    size -= sizeNeeded;
-    if (handle) {
-        fds += handle->numFds;
-        count -= static_cast<size_t>(handle->numFds);
-    }
-
-    return NO_ERROR;
-}
-
-status_t GraphicBuffer::unflatten(
-        void const*& buffer, size_t& size, int const*& fds, size_t& count) {
-    if (size < 11 * sizeof(int)) return NO_MEMORY;
-
-    int const* buf = static_cast<int const*>(buffer);
-    if (buf[0] != 'GBFR') return BAD_TYPE;
-
-    const size_t numFds  = static_cast<size_t>(buf[9]);
-    const size_t numInts = static_cast<size_t>(buf[10]);
-
-    // Limit the maxNumber to be relatively small. The number of fds or ints
-    // should not come close to this number, and the number itself was simply
-    // chosen to be high enough to not cause issues and low enough to prevent
-    // overflow problems.
-    const size_t maxNumber = 4096;
-    if (numFds >= maxNumber || numInts >= (maxNumber - 11)) {
-        width = height = stride = format = usage = 0;
-        handle = NULL;
-        ALOGE("unflatten: numFds or numInts is too large: %zd, %zd",
-                numFds, numInts);
-        return BAD_VALUE;
-    }
-
-    const size_t sizeNeeded = (11 + numInts) * sizeof(int);
-    if (size < sizeNeeded) return NO_MEMORY;
-
-    size_t fdCountNeeded = numFds;
-    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(
-                static_cast<int>(numFds), static_cast<int>(numInts));
-        if (!h) {
-            width = height = stride = format = usage = 0;
-            handle = NULL;
-            ALOGE("unflatten: native_handle_create failed");
-            return NO_MEMORY;
-        }
-        memcpy(h->data, fds, numFds * sizeof(int));
-        memcpy(h->data + numFds, &buf[11], numInts * sizeof(int));
-        handle = h;
-    } else {
-        width = height = stride = format = usage = 0;
-        handle = NULL;
-    }
-
-    mId = static_cast<uint64_t>(buf[6]) << 32;
-    mId |= static_cast<uint32_t>(buf[7]);
-
-    mGenerationNumber = static_cast<uint32_t>(buf[8]);
-
-    mOwner = ownHandle;
-
-    if (handle != 0) {
-        status_t err = mBufferMapper.registerBuffer(this);
-        if (err != NO_ERROR) {
-            width = height = stride = format = usage = 0;
-            handle = NULL;
-            ALOGE("unflatten: registerBuffer failed: %s (%d)",
-                    strerror(-err), err);
-            return err;
-        }
-    }
-
-    buffer = static_cast<void const*>(static_cast<uint8_t const*>(buffer) + sizeNeeded);
-    size -= sizeNeeded;
-    fds += numFds;
-    count -= numFds;
-
-    return NO_ERROR;
-}
-
-// ---------------------------------------------------------------------------
-
-}; // namespace android
\ No newline at end of file
diff --git a/mtk/libshims/ui/mtk_ui.cpp b/mtk/libshims/ui/mtk_ui.cpp
index f849dc5..a5e9c2d 100644
--- a/mtk/libshims/ui/mtk_ui.cpp
+++ b/mtk/libshims/ui/mtk_ui.cpp
@@ -1,5 +1,25 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdint.h>
+#include <sys/types.h>
+
+#include "GraphicBuffer.h"
 #include <ui/GraphicBufferMapper.h>
-#include <ui/Rect.h>
+#include <ui/PixelFormat.h>
 
 extern "C" {
     void _ZN7android19GraphicBufferMapper9lockYCbCrEPK13native_handlejRKNS_4RectEP13android_ycbcr(buffer_handle_t, uint32_t, const android::Rect&, android_ycbcr*);
@@ -8,3 +28,55 @@ extern "C" {
         _ZN7android19GraphicBufferMapper9lockYCbCrEPK13native_handlejRKNS_4RectEP13android_ycbcr(handle, static_cast<uint32_t>(usage), bounds, ycbcr);
     }
 }
+
+namespace android {
+
+static uint64_t getUniqueId() {
+    static volatile int32_t nextId = 0;
+    uint64_t id = static_cast<uint64_t>(getpid()) << 32;
+    id |= static_cast<uint32_t>(android_atomic_inc(&nextId));
+    return id;
+}
+
+GraphicBuffer::GraphicBuffer()
+    : BASE(), mOwner(ownData), mBufferMapper(GraphicBufferMapper::get()),
+      mInitCheck(NO_ERROR), mId(getUniqueId()), mGenerationNumber(0)
+{
+    width  =
+    height =
+    stride =
+    format =
+    usage  = 0;
+    handle = NULL;
+}
+
+GraphicBuffer::GraphicBuffer(uint32_t inWidth, uint32_t inHeight,
+        PixelFormat inFormat, uint32_t inUsage)
+    : BASE(), mOwner(ownData), mBufferMapper(GraphicBufferMapper::get()),
+      mInitCheck(NO_ERROR), mId(getUniqueId()), mGenerationNumber(0)
+{
+    width  =
+    height =
+    stride =
+    format =
+    usage  = 0;
+    handle = NULL;
+    mInitCheck = initSize(inWidth, inHeight, inFormat, inUsage, "<Unknown>");
+}
+
+GraphicBuffer::GraphicBuffer(uint32_t inWidth, uint32_t inHeight,
+        PixelFormat inFormat, uint32_t inUsage, std::string requestorName)
+    : BASE(), mOwner(ownData), mBufferMapper(GraphicBufferMapper::get()),
+      mInitCheck(NO_ERROR), mId(getUniqueId()), mGenerationNumber(0)
+{
+    width  =
+    height =
+    stride =
+    format =
+    usage  = 0;
+    handle = NULL;
+    mInitCheck = initSize(inWidth, inHeight, inFormat, inUsage,
+            std::move(requestorName));
+}
+
+};
\ No newline at end of file