{"id":11424,"url":"https://patchwork.libcamera.org/api/1.1/patches/11424/?format=json","web_url":"https://patchwork.libcamera.org/patch/11424/","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":"<20210301150111.61791-7-jacopo@jmondi.org>","date":"2021-03-01T15:01:07","name":"[libcamera-devel,06/10] android: camera_buffer: Implement libcamera::Extensible","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ac485003a7a8118e47216061d1ee6a875da2f914","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11424/mbox/","series":[{"id":1735,"url":"https://patchwork.libcamera.org/api/1.1/series/1735/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1735","date":"2021-03-01T15:01:01","name":"Support memory backends","version":1,"mbox":"https://patchwork.libcamera.org/series/1735/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11424/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11424/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 D4F96BD808\n\tfor ;\n\tMon, 1 Mar 2021 15:01:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AF4FA68A95;\n\tMon, 1 Mar 2021 16:01:03 +0100 (CET)","from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[217.70.183.194])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 782B060521\n\tfor ;\n\tMon, 1 Mar 2021 16:01:01 +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 relay2-d.mail.gandi.net (Postfix) with ESMTPSA id E803140012;\n\tMon, 1 Mar 2021 15:00:59 +0000 (UTC)"],"X-Originating-IP":"93.61.96.190","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 1 Mar 2021 16:01:07 +0100","Message-Id":"<20210301150111.61791-7-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.30.0","In-Reply-To":"<20210301150111.61791-1-jacopo@jmondi.org>","References":"<20210301150111.61791-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 06/10] android: camera_buffer: Implement\n\tlibcamera::Extensible","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","Cc":"Han-lin Chen ,\n\tDaniel Hung-yu Wu ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"In order to prepare to support more memory backends, make the\nCameraBuffer class implement the PIMPL (pointer-to-implementation)\npattern by inheriting from the libcamera::Extensible class.\n\nTemporary maintain libcamera::MappedBuffer as the CameraBuffer base\nclass to maintain compatibility of the CameraStream::process() interface\nthat requires a MappedBuffer * as second argument and will be converted\nto use a CameraBuffer in the next patch.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_buffer.h | 14 ++++-\n src/android/mm/generic_camera_buffer.cpp | 74 +++++++++++++++++++++++-\n 2 files changed, 86 insertions(+), 2 deletions(-)","diff":"diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h\nindex 0590cd84652b..ca4f4527c690 100644\n--- a/src/android/camera_buffer.h\n+++ b/src/android/camera_buffer.h\n@@ -9,13 +9,25 @@\n \n #include \n \n+#include \n #include \n+#include \n \n-class CameraBuffer : public libcamera::MappedBuffer\n+class CameraBuffer final : public libcamera::Extensible,\n+\t\t\t public libcamera::MappedBuffer\n {\n+\tLIBCAMERA_DECLARE_PRIVATE(CameraBuffer)\n+\n public:\n \tCameraBuffer(buffer_handle_t camera3Buffer, int flags);\n \t~CameraBuffer();\n+\n+\tbool isValid() const;\n+\n+\tunsigned int numPlanes() const;\n+\n+\tlibcamera::Span plane(unsigned int plane) const;\n+\tlibcamera::Span plane(unsigned int plane);\n };\n \n #endif /* __ANDROID_CAMERA_BUFFER_H__ */\ndiff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp\nindex d1407f9cddf4..eedf16b76542 100644\n--- a/src/android/mm/generic_camera_buffer.cpp\n+++ b/src/android/mm/generic_camera_buffer.cpp\n@@ -13,7 +13,25 @@ using namespace libcamera;\n \n LOG_DECLARE_CATEGORY(HAL)\n \n-CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags)\n+class CameraBuffer::Private : public Extensible::Private,\n+\t\t\t public libcamera::MappedBuffer\n+{\n+\tLIBCAMERA_DECLARE_PUBLIC(CameraBuffer)\n+\n+public:\n+\tPrivate(CameraBuffer *cameraBuffer,\n+\t\tbuffer_handle_t camera3Buffer, int flags);\n+\t~Private();\n+\n+\tunsigned int numPlanes() const;\n+\n+\tSpan plane(unsigned int plane) const;\n+\tSpan plane(unsigned int plane);\n+};\n+\n+CameraBuffer::Private::Private(CameraBuffer *cameraBuffer,\n+\t\t\t buffer_handle_t camera3Buffer, int flags)\n+\t: Extensible::Private(cameraBuffer)\n {\n \tmaps_.reserve(camera3Buffer->numFds);\n \terror_ = 0;\n@@ -42,6 +60,60 @@ CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags)\n \t}\n }\n \n+CameraBuffer::Private::~Private()\n+{\n+}\n+\n+unsigned int CameraBuffer::Private::numPlanes() const\n+{\n+\treturn maps_.size();\n+}\n+\n+Span CameraBuffer::Private::plane(unsigned int plane) const\n+{\n+\tif (plane >= maps_.size())\n+\t\treturn {};\n+\n+\treturn maps_[plane];\n+}\n+\n+Span CameraBuffer::Private::plane(unsigned int plane)\n+{\n+\tif (plane >= maps_.size())\n+\t\treturn {};\n+\n+\treturn maps_[plane];\n+}\n+\n+CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags)\n+\t: Extensible(new Private(this, camera3Buffer, flags))\n+{\n+}\n+\n CameraBuffer::~CameraBuffer()\n {\n }\n+\n+bool CameraBuffer::isValid() const\n+{\n+\tconst Private *const d = LIBCAMERA_D_PTR();\n+\treturn d->isValid();\n+}\n+\n+unsigned int CameraBuffer::numPlanes() const\n+{\n+\tconst Private *const d = LIBCAMERA_D_PTR();\n+\treturn d->numPlanes();\n+}\n+\n+Span CameraBuffer::plane(unsigned int plane) const\n+{\n+\tconst Private *const d = LIBCAMERA_D_PTR();\n+\treturn d->plane(plane);\n+}\n+\n+Span CameraBuffer::plane(unsigned int plane)\n+{\n+\tPrivate *const d = LIBCAMERA_D_PTR();\n+\treturn d->plane(plane);\n+}\n","prefixes":["libcamera-devel","06/10"]}