From patchwork Fri Feb 26 13:29:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 11405 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 6DAB7BD1F1 for ; Fri, 26 Feb 2021 13:29:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 403A368A87; Fri, 26 Feb 2021 14:29:24 +0100 (CET) Received: from relay12.mail.gandi.net (relay12.mail.gandi.net [217.70.178.232]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2A05368A7D for ; Fri, 26 Feb 2021 14:29:18 +0100 (CET) Received: from uno.LocalDomain (93-61-96-190.ip145.fastwebnet.it [93.61.96.190]) (Authenticated sender: jacopo@jmondi.org) by relay12.mail.gandi.net (Postfix) with ESMTPSA id E5994200007 for ; Fri, 26 Feb 2021 13:29:17 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Fri, 26 Feb 2021 14:29:32 +0100 Message-Id: <20210226132932.165484-13-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 12/12] android: mm: Provide helper macro for PIMPL X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Each memory backend has to declare a CameraBuffer class implementation that bridges the API calls to each CameraBufferImpl implementation. As the code is likely the same for most (if not all) backends, provide a convenience macro that expands to the CameraBuffer class declaration. Signed-off-by: Jacopo Mondi --- src/android/camera_buffer.h | 31 +++++++++++++++++++ src/android/mm/android_generic_buffer.cpp | 35 +--------------------- src/android/mm/cros_cbm.cpp | 36 +---------------------- 3 files changed, 33 insertions(+), 69 deletions(-) diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h index b251e4514864..e7f50a4622f9 100644 --- a/src/android/camera_buffer.h +++ b/src/android/camera_buffer.h @@ -30,4 +30,35 @@ private: CameraBufferImpl *impl_; }; +#define CAMERA_BUFFER_PIMPL \ + CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags) \ + : impl_(new CameraBuffer::CameraBufferImpl(camera3Buffer, \ + flags)) \ + { \ + } \ + CameraBuffer::~CameraBuffer() \ + { \ + delete impl_; \ + } \ + bool CameraBuffer::isValid() const \ + { \ + return impl_->isValid(); \ + } \ + unsigned int CameraBuffer::numPlanes() const \ + { \ + return impl_->numPlanes(); \ + } \ + ssize_t CameraBuffer::planeSize(unsigned int plane) const \ + { \ + return impl_->planeSize(plane); \ + } \ + const uint8_t *CameraBuffer::plane(unsigned int plane) const \ + { \ + return impl_->plane(plane); \ + } \ + uint8_t *CameraBuffer::plane(unsigned int plane) \ + { \ + return impl_->plane(plane); \ + } + #endif /* __ANDROID_CAMERA_BUFFER_H__ */ diff --git a/src/android/mm/android_generic_buffer.cpp b/src/android/mm/android_generic_buffer.cpp index 10a43a61bd4d..2f532be83cc9 100644 --- a/src/android/mm/android_generic_buffer.cpp +++ b/src/android/mm/android_generic_buffer.cpp @@ -89,37 +89,4 @@ uint8_t *CameraBuffer::CameraBufferImpl::plane(unsigned int plane) return maps_[plane].data(); } -CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags) - : impl_(new CameraBuffer::CameraBufferImpl(camera3Buffer, flags)) -{ -} - -CameraBuffer::~CameraBuffer() -{ - delete impl_; -} - -bool CameraBuffer::isValid() const -{ - return impl_->isValid(); -} - -unsigned int CameraBuffer::numPlanes() const -{ - return impl_->numPlanes(); -} - -ssize_t CameraBuffer::planeSize(unsigned int plane) const -{ - return impl_->planeSize(plane); -} - -const uint8_t *CameraBuffer::plane(unsigned int plane) const -{ - return impl_->plane(plane); -} - -uint8_t *CameraBuffer::plane(unsigned int plane) -{ - return impl_->plane(plane); -} +CAMERA_BUFFER_PIMPL diff --git a/src/android/mm/cros_cbm.cpp b/src/android/mm/cros_cbm.cpp index 6c931c99d2d0..ad18aede663a 100644 --- a/src/android/mm/cros_cbm.cpp +++ b/src/android/mm/cros_cbm.cpp @@ -130,38 +130,4 @@ uint8_t *CameraBuffer::CameraBufferImpl::plane(unsigned int plane) return static_cast(addr); } -CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags) - : impl_(new CameraBuffer::CameraBufferImpl(camera3Buffer, flags)) -{ -} - -CameraBuffer::~CameraBuffer() -{ - delete impl_; -} - -bool CameraBuffer::isValid() const -{ - return impl_->isValid(); -} - -unsigned int CameraBuffer::numPlanes() const -{ - return impl_->numPlanes(); -} - -ssize_t CameraBuffer::planeSize(unsigned int plane) const -{ - return impl_->planeSize(plane); -} - -const uint8_t *CameraBuffer::plane(unsigned int plane) const -{ - return impl_->plane(plane); -} - -uint8_t *CameraBuffer::plane(unsigned int plane) -{ - return impl_->plane(plane); -} - +CAMERA_BUFFER_PIMPL