From patchwork Thu Apr 17 11:35:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 23184 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 B2E6CC3213 for ; Thu, 17 Apr 2025 11:35:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D071268AC0; Thu, 17 Apr 2025 13:35:45 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="b4mdfVLh"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 776DE617E8 for ; Thu, 17 Apr 2025 13:35:43 +0200 (CEST) Received: from pb-laptop.local (185.221.143.16.nat.pool.zt.hu [185.221.143.16]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B6CD56A2 for ; Thu, 17 Apr 2025 13:33:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1744889619; bh=N5HOeHDcCvRz+tweAkZi65QD0yX0Kgq8ZQ3yK34x4v8=; h=From:To:Subject:Date:From; b=b4mdfVLhT6TktPwBNiCJ+8m3lGx181ackKV7XIfmX4/V5pOTP+2smk/xXUmFlEA3D p6xQnxSXtlW9LZNoUQ0vPjkQPrpuZVYUcKvy0gf+r+IE1y48uIrjZq/Q46kz9yZOHn NY+a0d7ottTrtkRjKeMsivM3Wxb/i9AK3xXH9nng= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 1/3] libcamera: controls: Give name to the union containing storage Date: Thu, 17 Apr 2025 13:35:37 +0200 Message-ID: <20250417113539.1137936-1-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 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" In order to be able to copy the storage as one unit, regardless of which member is active give a name to the union member. Signed-off-by: Barnabás Pőcze Reviewed-by: Kieran Bingham Reviewed-by: Jacopo Mondi --- include/libcamera/controls.h | 6 +++--- src/libcamera/controls.cpp | 17 ++++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 4bfe9615c..1dc6ccffa 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -238,9 +238,9 @@ private: bool isArray_; std::size_t numElements_ : 32; union { - uint64_t value_; - void *storage_; - }; + uint64_t internal; + void *external; + } storage_; void release(); void set(ControlType type, bool isArray, const void *data, diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 70f6f6092..d384e1ef7 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -122,10 +123,8 @@ void ControlValue::release() { std::size_t size = numElements_ * ControlValueSize[type_]; - if (size > sizeof(value_)) { - delete[] reinterpret_cast(storage_); - storage_ = nullptr; - } + if (size > sizeof(storage_.internal)) + delete[] reinterpret_cast(std::exchange(storage_.external, nullptr)); } ControlValue::~ControlValue() @@ -192,9 +191,9 @@ ControlValue &ControlValue::operator=(const ControlValue &other) Span ControlValue::data() const { std::size_t size = numElements_ * ControlValueSize[type_]; - const uint8_t *data = size > sizeof(value_) - ? reinterpret_cast(storage_) - : reinterpret_cast(&value_); + const uint8_t *data = size > sizeof(storage_.internal) + ? reinterpret_cast(storage_.external) + : reinterpret_cast(&storage_.internal); return { data, size }; } @@ -391,8 +390,8 @@ void ControlValue::reserve(ControlType type, bool isArray, std::size_t numElemen if (oldSize == newSize) return; - if (newSize > sizeof(value_)) - storage_ = reinterpret_cast(new uint8_t[newSize]); + if (newSize > sizeof(storage_.internal)) + storage_.external = new uint8_t[newSize]; } /**