{"id":19081,"url":"https://patchwork.libcamera.org/api/1.1/patches/19081/?format=json","web_url":"https://patchwork.libcamera.org/patch/19081/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20230923-gralloc-api-v4-v3-2-9a9e039284ba@baylibre.com>","date":"2023-09-23T16:23:32","name":"[libcamera-devel,v3,2/4] android: Import GraphicBufferAllocator header from vndk v33","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3533c4ef692c6bb8e829c401ef99d39beb2d516e","submitter":{"id":153,"url":"https://patchwork.libcamera.org/api/1.1/people/153/?format=json","name":"Mattijs Korpershoek","email":"mkorpershoek@baylibre.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19081/mbox/","series":[{"id":4035,"url":"https://patchwork.libcamera.org/api/1.1/series/4035/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4035","date":"2023-09-23T16:23:30","name":"android: switch over to modern gralloc API via libui","version":3,"mbox":"https://patchwork.libcamera.org/series/4035/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19081/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19081/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 7DFC3C326C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 23 Sep 2023 16:23:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 88D356294B;\n\tSat, 23 Sep 2023 18:23:43 +0200 (CEST)","from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com\n\t[IPv6:2a00:1450:4864:20::42e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 460CF61DE7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 23 Sep 2023 18:23:40 +0200 (CEST)","by mail-wr1-x42e.google.com with SMTP id\n\tffacd0b85a97d-31fa15f4cc6so3696097f8f.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 23 Sep 2023 09:23:40 -0700 (PDT)","from [192.168.0.39] ([2a01:e0a:324:38a0:25d4:3d10:65f9:654e])\n\tby smtp.gmail.com with ESMTPSA id\n\ty7-20020adfd087000000b00317f70240afsm7200595wrh.27.2023.09.23.09.23.39\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 23 Sep 2023 09:23:39 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1695486223;\n\tbh=lgj0ZB2d6fBtKECTnBueFfk0BmVgG8zjpZqDhXO0D7M=;\n\th=Date:References:In-Reply-To:To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=uvLhJCF3dgR5LtUEgYuLIkSzItArVhATrFlb+hCQY3gSWK8ha+hlrjncVrMHirfxk\n\teglPqM3o2R2vKPRykDfZ2N+stA8VIC4tr8z5I31ofrN+0p2gQVjfGY0BD9coP1u1nJ\n\t+nKEmP29RPFGunCxj2xKEGTIOxU+82xNWIto6Vl1itXYNVCT+KpnPXP+wq5LJ9Ae+v\n\ty0t05Nht2mb1mAvUpyEK6KSQXh/pxAJm1DkudAiJ8FdcpasG0qYuaa/CxnCU7MCkKx\n\ty3npj7jDXyHNkT972O9BHrwg0M5tMgOVz/u7+zGYuCF3hhchCp9AGfLBegDPEyE0Eb\n\tV9mblu2MVxdEg==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695486220;\n\tx=1696091020; darn=lists.libcamera.org; \n\th=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n\t:mime-version:subject:date:from:from:to:cc:subject:date:message-id\n\t:reply-to; bh=OqTOWyJSnZVOAfjh8r0tYOaae7jupjSbWMDA90wU7i8=;\n\tb=MblEazqfnwhljlLNteurkg9y1wawC/1nLic1EBI5byLGZk4DiUnpGtnXpnFK4CGCOm\n\tPt2kSA592+jpjSYk4jM2YYYvS37Lb2ZPL935f+a1nTB26ttByLwSnt89qKzI0Vnt0aG5\n\tp2H3Gid8yNS/A8/OeRRGnt21R/+QV2ZOTz3J+S7lBFkU/R4pgLjYLXLLbNU0zxh9u0uL\n\tm//3eCUzPc+3/xwai+ae8JoyTgR9Rv6aUXel3rHXIw9ZeagQ8cLXgY9vSAm62BWWIeKv\n\tiBxXXtcfthH3jgXuTEFc7bVVZrvizTnUtxlP0ezMO2bMQ4QVrSglJ8VGGgNK7nhrIQcn\n\thIJA=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=baylibre-com.20230601.gappssmtp.com\n\theader.i=@baylibre-com.20230601.gappssmtp.com header.b=\"MblEazqf\"; \n\tdkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1695486220; x=1696091020;\n\th=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n\t:mime-version:subject:date:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=OqTOWyJSnZVOAfjh8r0tYOaae7jupjSbWMDA90wU7i8=;\n\tb=uj2uA5C9BWUw074mKvO5/x6t3lr8rlGCVGphDIWjZe6oZmAUd7IrtUMla+egVlW9cJ\n\tJFV8StVymuGXliyvqFRt4kYX8bFqruBSUggB6gtChIup07ZctREr2NFUvd+fASccPpJ1\n\tmOJQjpNU69vRw8acXIquVFnrdW29ssATuNxnwsG39Yh38ufFys7kIl6+VL+NuGV2oY1+\n\tomlhgBzSmDcHtcz4pheFukJnTSf36kv7QimY2sHSdPNe0e03BQ53/8WSv3W4CDYJAvG1\n\tYoGlG+PZvocyIzDtWD3VuWyJ6wwDazpGHVqRx6Wm/0IFYreGR3St0nC6UHsiduqaAXTy\n\tqQuA==","X-Gm-Message-State":"AOJu0YwvNTui6zJYqHEoTp2YcsacUyvSiCKqcHU396GKmBgX2sZY6Shy\n\txs8IYcCeSc3rD7TyWyWnZ9n4pw==","X-Google-Smtp-Source":"AGHT+IGhn9dywGJNkcd6Twijd5731w0O0PYaRhh9OdRZVT6lWOvpMw2b3w9jH0VZc1SYpxcFYLf2sg==","X-Received":"by 2002:adf:fe85:0:b0:319:8a28:4001 with SMTP id\n\tl5-20020adffe85000000b003198a284001mr2069800wrr.41.1695486219995; \n\tSat, 23 Sep 2023 09:23:39 -0700 (PDT)","Date":"Sat, 23 Sep 2023 18:23:32 +0200","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"<20230923-gralloc-api-v4-v3-2-9a9e039284ba@baylibre.com>","References":"<20230923-gralloc-api-v4-v3-0-9a9e039284ba@baylibre.com>","In-Reply-To":"<20230923-gralloc-api-v4-v3-0-9a9e039284ba@baylibre.com>","To":"libcamera-devel@lists.libcamera.org","X-Mailer":"b4 0.12.4-dev-6aa5d","Subject":"[libcamera-devel] [PATCH v3 2/4] android: Import\n\tGraphicBufferAllocator header from vndk v33","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","From":"Mattijs Korpershoek via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>","Reply-To":"Mattijs Korpershoek <mkorpershoek@baylibre.com>","Cc":"Jacopo Mondi <jacopo.mondi@ideasonboard.com>,\n\tGuillaume La Roque <glaroque@baylibre.com>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"The GraphicBufferAllocator class (from libui) provides a more modern interface\nto Android buffer allocation.\n\nMoreover, the gralloc.h API has been deprecated since Android P (9).\n\nImport the GraphicBufferAllocator.h from the VNDK.\n\nThese have been imported from:\nURL: https://android.googlesource.com/platform/prebuilts/vndk/v33/\nrev: 390028a9da88 (\"Update VNDK snapshot v33 to build 9948968. am: 3042508aee am: 7092391a46\")\n\nNo changes have been made to the files, besides adding the SPDX comment.\n\nNote: because GraphicBufferAllocator has lots of Android-specific dependencies,\na future patch is needed to stub/simplify this include.\n\nSigned-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>\n---\n .../libs/ui/include/ui/GraphicBufferAllocator.h    | 111 +++++++++++++++++++++\n 1 file changed, 111 insertions(+)","diff":"diff --git a/include/android/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h b/include/android/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h\nnew file mode 100644\nindex 000000000000..e4674d746e37\n--- /dev/null\n+++ b/include/android/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h\n@@ -0,0 +1,111 @@\n+/* SPDX-License-Identifier: Apache-2.0 */\n+/*\n+ *\n+ * Copyright 2009, The Android Open Source Project\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ *     http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+#ifndef ANDROID_BUFFER_ALLOCATOR_H\n+#define ANDROID_BUFFER_ALLOCATOR_H\n+\n+#include <stdint.h>\n+\n+#include <memory>\n+#include <string>\n+\n+#include <cutils/native_handle.h>\n+\n+#include <ui/PixelFormat.h>\n+\n+#include <utils/Errors.h>\n+#include <utils/KeyedVector.h>\n+#include <utils/Mutex.h>\n+#include <utils/Singleton.h>\n+\n+namespace android {\n+\n+class GrallocAllocator;\n+class GraphicBufferMapper;\n+\n+class GraphicBufferAllocator : public Singleton<GraphicBufferAllocator>\n+{\n+public:\n+    static inline GraphicBufferAllocator& get() { return getInstance(); }\n+\n+    /**\n+     * Allocates and imports a gralloc buffer.\n+     *\n+     * The handle must be freed with GraphicBufferAllocator::free() when no longer needed.\n+     */\n+    status_t allocate(uint32_t w, uint32_t h, PixelFormat format, uint32_t layerCount,\n+                      uint64_t usage, buffer_handle_t* handle, uint32_t* stride,\n+                      std::string requestorName);\n+\n+    /**\n+     * Allocates and does NOT import a gralloc buffer. Buffers cannot be used until they have\n+     * been imported. This function is for advanced use cases only.\n+     *\n+     * The raw native handle must be freed by calling native_handle_close() followed by\n+     * native_handle_delete().\n+     */\n+    status_t allocateRawHandle(uint32_t w, uint32_t h, PixelFormat format, uint32_t layerCount,\n+                               uint64_t usage, buffer_handle_t* handle, uint32_t* stride,\n+                               std::string requestorName);\n+\n+    /**\n+     * DEPRECATED: GraphicBufferAllocator does not use the graphicBufferId.\n+     */\n+    status_t allocate(uint32_t w, uint32_t h, PixelFormat format,\n+            uint32_t layerCount, uint64_t usage,\n+            buffer_handle_t* handle, uint32_t* stride, uint64_t graphicBufferId,\n+            std::string requestorName);\n+\n+    status_t free(buffer_handle_t handle);\n+\n+    uint64_t getTotalSize() const;\n+\n+    void dump(std::string& res, bool less = true) const;\n+    static void dumpToSystemLog(bool less = true);\n+\n+protected:\n+    struct alloc_rec_t {\n+        uint32_t width;\n+        uint32_t height;\n+        uint32_t stride;\n+        PixelFormat format;\n+        uint32_t layerCount;\n+        uint64_t usage;\n+        size_t size;\n+        std::string requestorName;\n+    };\n+\n+    status_t allocateHelper(uint32_t w, uint32_t h, PixelFormat format, uint32_t layerCount,\n+                            uint64_t usage, buffer_handle_t* handle, uint32_t* stride,\n+                            std::string requestorName, bool importBuffer);\n+\n+    static Mutex sLock;\n+    static KeyedVector<buffer_handle_t, alloc_rec_t> sAllocList;\n+\n+    friend class Singleton<GraphicBufferAllocator>;\n+    GraphicBufferAllocator();\n+    ~GraphicBufferAllocator();\n+\n+    GraphicBufferMapper& mMapper;\n+    std::unique_ptr<const GrallocAllocator> mAllocator;\n+};\n+\n+// ---------------------------------------------------------------------------\n+}; // namespace android\n+\n+#endif // ANDROID_BUFFER_ALLOCATOR_H\n","prefixes":["libcamera-devel","v3","2/4"]}