Patch Detail
Show a patch.
GET /api/patches/11404/?format=api
{ "id": 11404, "url": "https://patchwork.libcamera.org/api/patches/11404/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11404/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20210226132932.165484-12-jacopo@jmondi.org>", "date": "2021-02-26T13:29:31", "name": "[libcamera-devel,11/12] android: Introduce cros_cbm_buffer", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "bb5259d8b064f246ea7498ecae81b68898a457af", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/11404/mbox/", "series": [ { "id": 1731, "url": "https://patchwork.libcamera.org/api/series/1731/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1731", "date": "2021-02-26T13:29:20", "name": "android: Support memory backends", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1731/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11404/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11404/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 1097EBD80C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 26 Feb 2021 13:29:24 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C788F68A93;\n\tFri, 26 Feb 2021 14:29:23 +0100 (CET)", "from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BB67D68A69\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 26 Feb 2021 14:29:17 +0100 (CET)", "from uno.LocalDomain (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay12.mail.gandi.net (Postfix) with ESMTPSA id 7FF19200005\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 26 Feb 2021 13:29:17 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 26 Feb 2021 14:29:31 +0100", "Message-Id": "<20210226132932.165484-12-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.30.0", "In-Reply-To": "<20210226132932.165484-1-jacopo@jmondi.org>", "References": "<20210226132932.165484-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 11/12] android: Introduce cros_cbm_buffer", "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>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Introduce the CameraBuffer backend for the ChromeOS operating system.\n\nThe cros_cbm CameraBuffer implementation uses the ChromeOS\nCameraBufferManager class to perform mapping of 1 plane and multiplane\nbuffers.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/mm/cros_cbm.cpp | 167 ++++++++++++++++++++++++++++++++++++\n src/android/mm/meson.build | 3 +\n 2 files changed, 170 insertions(+)\n create mode 100644 src/android/mm/cros_cbm.cpp", "diff": "diff --git a/src/android/mm/cros_cbm.cpp b/src/android/mm/cros_cbm.cpp\nnew file mode 100644\nindex 000000000000..6c931c99d2d0\n--- /dev/null\n+++ b/src/android/mm/cros_cbm.cpp\n@@ -0,0 +1,167 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021, Google Inc.\n+ *\n+ * cros_cbm.cpp - ChromiumOS libcbm frame buffer backend\n+ */\n+\n+#include \"../camera_buffer.h\"\n+\n+#include \"libcamera/internal/log.h\"\n+\n+#include \"cros-camera/camera_buffer_manager.h\"\n+\n+using namespace libcamera;\n+\n+LOG_DECLARE_CATEGORY(HAL)\n+\n+class CameraBuffer::CameraBufferImpl : public libcamera::MappedBuffer\n+{\n+public:\n+\tCameraBufferImpl(buffer_handle_t camera3Buffer, int flags);\n+\t~CameraBufferImpl();\n+\n+\tbool isValid() const { return valid_; }\n+\n+\tunsigned int numPlanes() const;\n+\tssize_t planeSize(unsigned int plane) const;\n+\n+\tconst uint8_t *plane(unsigned int plane) const;\n+\tuint8_t *plane(unsigned int plane);\n+\n+private:\n+\tcros::CameraBufferManager *bufferManager_;\n+\tbuffer_handle_t handle_;\n+\tunsigned int numPlanes_;\n+\tbool valid_;\n+\tunion {\n+\t\tvoid *addr;\n+\t\tandroid_ycbcr ycbcr;\n+\t} mem;\n+};\n+\n+CameraBuffer::CameraBufferImpl::CameraBufferImpl(buffer_handle_t camera3Buffer,\n+\t\t\t\t\t\t int flags)\n+\t: handle_(camera3Buffer), numPlanes_(0), valid_(false)\n+{\n+\tbufferManager_ = cros::CameraBufferManager::GetInstance();\n+\n+\tbufferManager_->Register(camera3Buffer);\n+\n+\tnumPlanes_ = bufferManager_->GetNumPlanes(camera3Buffer);\n+\tswitch (numPlanes_) {\n+\tcase 1: {\n+\t\tint ret = bufferManager_->Lock(handle_, 0, 0, 0, 0, 0, &mem.addr);\n+\t\tif (ret) {\n+\t\t\tLOG(HAL, Error) << \"Single plane buffer mapping failed\";\n+\t\t\treturn;\n+\t\t}\n+\t\tbreak;\n+\t}\n+\tcase 2: {\n+\tcase 3:\n+\t\tint ret = bufferManager_->LockYCbCr(handle_, 0, 0, 0, 0, 0,\n+\t\t\t\t\t\t &mem.ycbcr);\n+\t\tif (ret) {\n+\t\t\tLOG(HAL, Error) << \"YCbCr buffer mapping failed\";\n+\t\t\treturn;\n+\t\t}\n+\t\tbreak;\n+\t}\n+\tdefault:\n+\t\tLOG(HAL, Error) << \"Invalid number of planes: \" << numPlanes_;\n+\t\treturn;\n+\t}\n+\n+\tvalid_ = true;\n+}\n+\n+CameraBuffer::CameraBufferImpl::~CameraBufferImpl()\n+{\n+\tbufferManager_->Unlock(handle_);\n+\tbufferManager_->Deregister(handle_);\n+}\n+\n+unsigned int CameraBuffer::CameraBufferImpl::numPlanes() const\n+{\n+\treturn bufferManager_->GetNumPlanes(handle_);\n+}\n+\n+ssize_t CameraBuffer::CameraBufferImpl::planeSize(unsigned int plane) const\n+{\n+\tif (plane >= numPlanes())\n+\t\treturn -EINVAL;\n+\n+\treturn bufferManager_->GetPlaneSize(handle_, plane);\n+}\n+\n+const uint8_t *CameraBuffer::CameraBufferImpl::plane(unsigned int plane) const\n+{\n+\tif (plane >= numPlanes())\n+\t\treturn nullptr;\n+\n+\treturn const_cast<const uint8_t *>(this->plane(plane));\n+}\n+\n+uint8_t *CameraBuffer::CameraBufferImpl::plane(unsigned int plane)\n+{\n+\tif (plane >= numPlanes())\n+\t\treturn nullptr;\n+\n+\tvoid *addr;\n+\tswitch (numPlanes()) {\n+\tcase 1:\n+\t\taddr = mem.addr;\n+\t\tbreak;\n+\tdefault:\n+\t\tswitch (plane) {\n+\t\tcase 1:\n+\t\t\taddr = mem.ycbcr.y;\n+\t\t\tbreak;\n+\t\tcase 2:\n+\t\t\taddr = mem.ycbcr.cb;\n+\t\t\tbreak;\n+\t\tcase 3:\n+\t\t\taddr = mem.ycbcr.cr;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\treturn static_cast<uint8_t *>(addr);\n+}\n+\n+CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags)\n+\t: impl_(new CameraBuffer::CameraBufferImpl(camera3Buffer, flags))\n+{\n+}\n+\n+CameraBuffer::~CameraBuffer()\n+{\n+\tdelete impl_;\n+}\n+\n+bool CameraBuffer::isValid() const\n+{\n+\treturn impl_->isValid();\n+}\n+\n+unsigned int CameraBuffer::numPlanes() const\n+{\n+\treturn impl_->numPlanes();\n+}\n+\n+ssize_t CameraBuffer::planeSize(unsigned int plane) const\n+{\n+\treturn impl_->planeSize(plane);\n+}\n+\n+const uint8_t *CameraBuffer::plane(unsigned int plane) const\n+{\n+\treturn impl_->plane(plane);\n+}\n+\n+uint8_t *CameraBuffer::plane(unsigned int plane)\n+{\n+\treturn impl_->plane(plane);\n+}\n+\ndiff --git a/src/android/mm/meson.build b/src/android/mm/meson.build\nindex 39be8fec8567..a801c54ff4f4 100644\n--- a/src/android/mm/meson.build\n+++ b/src/android/mm/meson.build\n@@ -3,4 +3,7 @@\n memory_backend = get_option('android_memory_backend')\n if memory_backend == 'android_generic'\n android_hal_sources += files(['android_generic_buffer.cpp'])\n+elif memory_backend == 'cros_cbm'\n+ android_hal_sources += files(['cros_cbm.cpp'])\n+ android_deps += [ dependency('libcros_camera') ]\n endif\n", "prefixes": [ "libcamera-devel", "11/12" ] }