From patchwork Tue Nov 23 18:39:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 14725 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 83B65BDB13 for ; Tue, 23 Nov 2021 18:39:57 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1241B60230; Tue, 23 Nov 2021 19:39:57 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="htQUDLdC"; dkim-atps=neutral Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D7A5860121 for ; Tue, 23 Nov 2021 19:39:55 +0100 (CET) Received: by mail-pg1-x52d.google.com with SMTP id l190so8545641pge.7 for ; Tue, 23 Nov 2021 10:39:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/j9kaiKIR7+PMxo+OjvTZWZwMjPBYpeCqvjka9YeKs4=; b=htQUDLdCSWfvcjVPgRGEiCCDSpTNVvlcbMKrmEGtb7jW/7c60h6fUcuHnsYGZq0wgs +058Q7lS6Bn6/385ndKkaT7W7KxFDkmaJNiDZ/9IO02iurH/33Bv8JkTlOzsghzUsJzG F7MAMytKwvOkQtDmPWgGH12UWfj26EuDfJ5Ug= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/j9kaiKIR7+PMxo+OjvTZWZwMjPBYpeCqvjka9YeKs4=; b=nncSPRXLU5RVXmfpELPJ6j8o3uiQ/DFu9/rSCIuwtc3JnRC3Avj+qRaN+7yxEuhAJ2 JwCpzw3U0IPWh4h7M0+bJIpRli3D/sKtqHMmHtl34heAMTcEoPDC/h5wekYpKaPLsA91 n11yeM+SyVhHlSPxxRLueyAWTQXXgaPvwdHWRXXqLwjOFVcdHUFRBEbmSWXRzDkU+MIE wkgHIITuWab55dCwNQ/HJln1Gp+9Q3FqVahVIc03/PiGM9Z+XtarPTnLwm2hchcLDEUh 3zrYA+uhV6d1vwKowOpGvqGwRSSfetDn9+gVp9SRiwfJkg4cb6M/EYMQfSYTMkhE9n/W dbGA== X-Gm-Message-State: AOAM532IU5VLG+L7V8XPQqxWkNo4LS8Gc4HGKEReO9s1vt6SyS3WU6M9 Pxt4pRwr3d7+PIRHHUCrAKR3YOhN7jaS1g== X-Google-Smtp-Source: ABdhPJwfSLC/xhQpDY4ONIhhXdS8Jqpne0ZwE+XmK4JDlCGvH2uoojHNJlvAW+bNz6YdfmA/yxYbHw== X-Received: by 2002:a65:45ca:: with SMTP id m10mr5395542pgr.461.1637692793712; Tue, 23 Nov 2021 10:39:53 -0800 (PST) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:cc8f:f5a6:5a9f:7275]) by smtp.gmail.com with ESMTPSA id 66sm5630pgg.63.2021.11.23.10.39.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Nov 2021 10:39:53 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Wed, 24 Nov 2021 03:39:46 +0900 Message-Id: <20211123183947.46839-1-hiroh@chromium.org> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 1/2] libcamera: framebuffer: Enable attaching additional data to FrameBuffer 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" We cannot have a subclass of FrameBuffer because it is marked as final. This adds a FrameBuffer constructor with FrameBuffer::Private. So we can attach some additional resources with FrameBuffer through a customized FrameBuffer::Private class. Signed-off-by: Hirokazu Honda Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- include/libcamera/framebuffer.h | 2 ++ include/libcamera/internal/framebuffer.h | 1 + src/libcamera/framebuffer.cpp | 24 ++++++++++++++++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/include/libcamera/framebuffer.h b/include/libcamera/framebuffer.h index 7f2f176a..abcede31 100644 --- a/include/libcamera/framebuffer.h +++ b/include/libcamera/framebuffer.h @@ -58,6 +58,8 @@ public: }; FrameBuffer(const std::vector &planes, unsigned int cookie = 0); + FrameBuffer(std::unique_ptr d, + const std::vector &planes, unsigned int cookie = 0); const std::vector &planes() const { return planes_; } Request *request() const; diff --git a/include/libcamera/internal/framebuffer.h b/include/libcamera/internal/framebuffer.h index cd33c295..3cced5b1 100644 --- a/include/libcamera/internal/framebuffer.h +++ b/include/libcamera/internal/framebuffer.h @@ -19,6 +19,7 @@ class FrameBuffer::Private : public Extensible::Private public: Private(); + virtual ~Private(); void setRequest(Request *request) { request_ = request; } bool isContiguous() const { return isContiguous_; } diff --git a/src/libcamera/framebuffer.cpp b/src/libcamera/framebuffer.cpp index 337ea115..3a324471 100644 --- a/src/libcamera/framebuffer.cpp +++ b/src/libcamera/framebuffer.cpp @@ -116,6 +116,13 @@ FrameBuffer::Private::Private() { } +/** + * \brief FrameBuffer::Private destructor + */ +FrameBuffer::Private::~Private() +{ +} + /** * \fn FrameBuffer::Private::setRequest() * \brief Set the request this buffer belongs to @@ -213,8 +220,21 @@ FrameBuffer::Private::Private() * \param[in] cookie Cookie */ FrameBuffer::FrameBuffer(const std::vector &planes, unsigned int cookie) - : Extensible(std::make_unique()), planes_(planes), - cookie_(cookie) + : FrameBuffer(std::make_unique(), planes, cookie) +{ +} + +/** + * \brief Construct a FrameBuffer with an extensible private class and an array + * of planes + * \param[in] d The extensible private class + * \param[in] planes The frame memory planes + * \param[in] cookie Cookie + */ +FrameBuffer::FrameBuffer(std::unique_ptr d, + const std::vector &planes, + unsigned int cookie) + : Extensible(std::move(d)), planes_(planes), cookie_(cookie) { metadata_.planes_.resize(planes_.size());