{"id":18986,"url":"https://patchwork.libcamera.org/api/1.1/patches/18986/?format=json","web_url":"https://patchwork.libcamera.org/patch/18986/","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":"<20230912-gralloc-api-v4-v1-2-0f80402d8e7a@baylibre.com>","date":"2023-09-12T09:36:11","name":"[libcamera-devel,2/4] android: Import GraphicBufferAllocator header from vndk v33","commit_ref":null,"pull_url":null,"state":"superseded","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/18986/mbox/","series":[{"id":4016,"url":"https://patchwork.libcamera.org/api/1.1/series/4016/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4016","date":"2023-09-12T09:36:09","name":"android: switch over to modern gralloc API via libui","version":1,"mbox":"https://patchwork.libcamera.org/series/4016/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18986/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18986/checks/","tags":{},"headers":{"Return-Path":"","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 94A40C32B0\n\tfor ;\n\tTue, 12 Sep 2023 09:36:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B49E1628F4;\n\tTue, 12 Sep 2023 11:36:22 +0200 (CEST)","from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com\n\t[IPv6:2a00:1450:4864:20::32a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5B3B3628E9\n\tfor ;\n\tTue, 12 Sep 2023 11:36:20 +0200 (CEST)","by mail-wm1-x32a.google.com with SMTP id\n\t5b1f17b1804b1-402c46c49f4so57790345e9.1\n\tfor ;\n\tTue, 12 Sep 2023 02:36:20 -0700 (PDT)","from [192.168.2.39] ([82.66.159.240])\n\tby smtp.gmail.com with ESMTPSA id\n\ty10-20020a05600c364a00b00401b242e2e6sm15578253wmq.47.2023.09.12.02.36.19\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 12 Sep 2023 02:36:19 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1694511382;\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:\n\tFrom;\n\tb=bY8lm3tcQQn1XiptEi6JQ4NB9AZcD05oZ+/4tfhTkCaTIQh7TwqFBN8xQLPSuNuac\n\tTG2LiKF/s1oXuFHmJnqH53dmriYQzyINm/SN9Yul2PAQHvGNOWw1Z/yEFqqKypbCd+\n\tVygiIv/ASKMm/wNNx5UXtulIGtYo4Ej+PSzp1SNk+tizCvZZkHuvcwkelVWRnLzEKm\n\tDQzCL2Hqt/NZM/MgINNswpwpe/a66GoqCZXHpFhUy5tdQ68LErzecdp/XoKmcpD+bz\n\tZIhI8G70sQOr9QzTSP9R5Fh01Xfum1MssEgpM+iYQBcFLfIvmdTA7rSEHBTEiFZZHZ\n\tMvJ9amF5lMOrA==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1694511380;\n\tx=1695116180; 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=1V8jVooCdGG1Jd22iZQiY9kaqyfkx7KldPIN3JIBfYwBO8/dulcCD3O3Y6mQJIdbIc\n\t2YHRFn0SOEx3fuDfVnq+7+tDGYrdGORVskMaHNuq0u752dwk060DKcAM/B5eV9UFve7I\n\tSLXm1+TXc1t7vi6rW6+uW+V0qgkpuPvOr/dLT6mCN2VEjihNR6jhrpzbf7naDhDBxJE2\n\tobGCB7rJuhzdyaJB5czSDGKZEyZAqjbdcTu63iG6q7xzzdgPIzwvxnM01brUk757QFvk\n\tRSw2dxOdaK2gdxKlWwJvQT/LayxbH6jrLpyDJ0fhQ2NXvujsW1/2HpY0y/JiKJ51Gb2K\n\tmUww=="],"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=\"1V8jVooC\"; \n\tdkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1694511380; x=1695116180;\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=oK5q2y5SzBgOgHKK0yuokdC1oYEKj63pGQtC4uhQSNT0ujBJTVuxeBpm9AaIezVIQO\n\tg4ZjzPu8GD2u20fIAxNrjG/pX6++6kVkNesyakrvbQCLWE4K/Zp+xfLfEUzghGBJ8W6l\n\to4y7qntYn2Enp8xYcrgif/AV94BUeI5a8/VFcwNnvY7VGXUJkrT+a8SYL1IozlmAcwZt\n\t7Rjue/4ynsXHRyjB9GtfO496sPEfNA/144iCewrAMeAA216g1h3/Obrtp2jBSxRAZOGp\n\tQuB+En8XNJ5UO0+dSoVdgtSkaxejzeaiO8dOPLXSK5gdBt7ON+r2hSI/Pfeh26hMvEIv\n\t2VDw==","X-Gm-Message-State":"AOJu0Yw/zd0HpTmUGI7twtff+S8c0vUOAopjl/mEeJzIFCt0xn1VpC4I\n\tPdEYEDFU6weZV1/j+3SSYZR6qDY1Xv2Lw2LKlPA=","X-Google-Smtp-Source":"AGHT+IEemB9oUf7KGAKpjTJg3GarY4rBhR5P4MFtG2HaxamwjNXn+tGr4Tb0qmn9xD/1fT/iy/BTPA==","X-Received":"by 2002:a7b:ce85:0:b0:401:bf62:9456 with SMTP id\n\tq5-20020a7bce85000000b00401bf629456mr9744354wmj.8.1694511379928; \n\tTue, 12 Sep 2023 02:36:19 -0700 (PDT)","Date":"Tue, 12 Sep 2023 11:36:11 +0200","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"<20230912-gralloc-api-v4-v1-2-0f80402d8e7a@baylibre.com>","References":"<20230912-gralloc-api-v4-v1-0-0f80402d8e7a@baylibre.com>","In-Reply-To":"<20230912-gralloc-api-v4-v1-0-0f80402d8e7a@baylibre.com>","To":"libcamera-devel@lists.libcamera.org","X-Mailer":"b4 0.12.3","Subject":"[libcamera-devel] [PATCH 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Mattijs Korpershoek via libcamera-devel\n\t","Reply-To":"Mattijs Korpershoek ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"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 \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 \n+\n+#include \n+#include \n+\n+#include \n+\n+#include \n+\n+#include \n+#include \n+#include \n+#include \n+\n+namespace android {\n+\n+class GrallocAllocator;\n+class GraphicBufferMapper;\n+\n+class GraphicBufferAllocator : public Singleton\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 sAllocList;\n+\n+ friend class Singleton;\n+ GraphicBufferAllocator();\n+ ~GraphicBufferAllocator();\n+\n+ GraphicBufferMapper& mMapper;\n+ std::unique_ptr mAllocator;\n+};\n+\n+// ---------------------------------------------------------------------------\n+}; // namespace android\n+\n+#endif // ANDROID_BUFFER_ALLOCATOR_H\n","prefixes":["libcamera-devel","2/4"]}