From patchwork Sun Aug 24 00:48:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 24206 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 7BB61BEFBE for ; Sun, 24 Aug 2025 00:49:27 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B4A076932D; Sun, 24 Aug 2025 02:49:26 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="UjxTMeyI"; dkim-atps=neutral Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7999F692E3 for ; Sun, 24 Aug 2025 02:48:57 +0200 (CEST) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-45b4d89217aso16725425e9.2 for ; Sat, 23 Aug 2025 17:48:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755996537; x=1756601337; darn=lists.libcamera.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=yLq21F5yRryLv7x5cIsVnUA+04op7PybL91l/CYRfb8=; b=UjxTMeyIFK960KLhHQLxt+44vUmkJlbJWG45nh04nh1CcL/eJzVXhgAlFOwZ4r1mdb jKHsueetkPsEhwpMjoSIRPMRf3LOYs1S4lEF2i9jwOn/7B0HEDznhjd6wJNVJZZDHWop eLmKTPt4xKECHr+EiOWnBd8b/MMeCsjq6zdbGrMeq2iHuMrghZRzaF9N+aaX4iNmfjWh RL/nQjqpLPq9wI9acqBbBySDWJxextFml/Qkzp0soAByFRWTb1eYhqy+Z3nndIDDhoTa iFfBLzGVQ9E0AuI8L1zq+oSLahWIi2/5Pvsh7sRY92cYbzCcuNlGJKtpaWT+U91FjwVx /uGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755996537; x=1756601337; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yLq21F5yRryLv7x5cIsVnUA+04op7PybL91l/CYRfb8=; b=gQxX6eeqz6AXVfKxkcHoZGP0DV/WCE8ySCyj6gM16vPOuVQhUkGxjRMQ/iUoy1kzpl Uj8W8Hs2mylmJBdMhqIGFEQawo5N0ph3tbojK+f+ldLkNoElh3MbMK4d7V72gNa/l5XA fNo/pUS0GgFzbtQ335b+9bRTVtOqCLbRGrWTAVxScD4kvT5znwC2rD/4pAFHX4Cxm82c 4qsGiB2jM96KUzOtDyiynqeMSQkrWZgZEOQcubIIqy7ewzrMkU7Z9e/hG0fM1U/4Xodi WEvWBV0CWxEyxQZQF4eNkJD7pLePaxpO43+yZWLOHIaMziIc6ulJdpGWin/GmiueQpN/ xYxw== X-Gm-Message-State: AOJu0YzGMrrMTKuH/XaiGpQmXP1c69yJQpZJXiIQORH0uf/1ZYZ+A29a 90sAmdNy1YpLebxddMVYYE2ONQ5r9n/4N0HYMyphkKUQsxiDvItvMK6+qKlEppaNHWJWuYtWxec aKZvKFoU= X-Gm-Gg: ASbGnctzwQWcnaBwN/+X20+BFzaB2GqYyZGvtq0natsqNpRGXfoHMFy8+8U85i2/C/4 LgatJIhWntqARNLQh1iddTgGCzlagH22S7NECIrp1zIgp8AGK9LKk/h04rmMlpIELfD3l9by5Gs V8GOj4PxIcClyse1FLGdeQsACQF1QNgpP+E4q/IR/rtlg1qJZv8FqFrdhA3DsC9CKmSRg5H+fu0 QIASsXUyXsCIpgIGHX513Udo1xMPtPLAEATT7Q/xndvBvyLcBsJBJpVULOfOoqIxZwYFBCqoT/M PIk3+OLklK0XP1MSDfxzkSkP0Ih1KBrn8A1ugCBFgdy+WBVarRv/w/cWviOVMz4iU2vMG6cUS9e jbcQecqmZfR2h6iyjIZWTTS8djiLF9L6HAQUqL7s4hDYIaRyTyezP1PHRMfR9vBEXTtbKTSrYzh q+L21xfG8YeNhyBqqCvLoT X-Google-Smtp-Source: AGHT+IHgep8TtyKon7npTUgFygnm5xKCcKaFXbtRlS/j+/kvgxhqPhagwUPkk0pb5V1e6/0VPV3ZCw== X-Received: by 2002:a05:600c:5494:b0:459:94a7:220f with SMTP id 5b1f17b1804b1-45b517dd998mr53252775e9.26.1755996536801; Sat, 23 Aug 2025 17:48:56 -0700 (PDT) Received: from [192.168.0.13] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b4e1d530esm69347225e9.0.2025.08.23.17.48.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 17:48:56 -0700 (PDT) From: Bryan O'Donoghue Date: Sun, 24 Aug 2025 01:48:35 +0100 Subject: [PATCH v2 23/37] libcamera: utils: Move ALIGN_TO from camera_metadata.c to utils.h MIME-Version: 1.0 Message-Id: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-23-96f4576c814e@linaro.org> References: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org> In-Reply-To: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org> To: libcamera-devel@lists.libcamera.org Cc: Bryan O'Donoghue X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1627; i=bryan.odonoghue@linaro.org; h=from:subject:message-id; bh=EwojlEA7u5QGO/oFAUMxFKVPV5YgZWQoU9hMLxM2CFs=; b=owEBbQKS/ZANAwAKASJxO7Ohjcg6AcsmYgBoqmFg+Wa+wvgh4Bw8ub4iobUKHQtFoM72/DpBC hImn6QALG6JAjMEAAEKAB0WIQTmk/sqq6Nt4Rerb7QicTuzoY3IOgUCaKphYAAKCRAicTuzoY3I OkttD/9wPFft/k5nU1HlyRTQA6QcyBkTp27Bk5VxJZKkvUHW1XaSCNq9EmiDrnKN5a0HFDKQLw+ iXtrS8avTcPcPFq1sXov9Bq3B9QAcs/DyLm1TLU3ZCMgqreRynbTPY8dSQwEOUf7DDWccpKptHr qiWUbbeKv47jEOYqFbhXXBq8xJEnUOVsTnZ/lpuLa8kvYlJK5p35Kgm4vc/ggnwrTKUnQgEbXJY /s62FlSZ3hCfQG0QcCgOlY7LDdJCpjqfhUemcN4E0Uyvj4rDRL96Vr0tm4FDUpjXYHgHlsqV7Sx WgRox+v9y6gvuw4aa1M//GeeGlxH4NcClfsE3NbFD8Gtx/LINnwfZYZewNY28vuMsx0PR8tfbjr ftuXf9vpThq2u1Hkh4hrCvBtUT29T0n4JQoxBwUwxtz3AK4UDuHqX0mLB18S1P+f0c3t5K49wKV MNUrk5dbL1XaznTZTjEIMwi39MKMQXpsq6fENu+oYXejTa2uq+0qBwY2J2kD9/FiL07Xxdb5b/R OoodgbVYxMqQK2D0NpIWgI6tTg5z5Vq+opi67erfcPt9qza9Spw9pAQ9hIRM62c9tvwbs+RylUO BMQ4SGVgrD8xXnLFMjGYQsq4nlmbpydWBag2U3joW/f7BFoVk1SzvLuUTi7c1IKT0BBhdmkvu+F waSl/iXPzn7CZVw== X-Developer-Key: i=bryan.odonoghue@linaro.org; a=openpgp; fpr=E693FB2AABA36DE117AB6FB422713BB3A18DC83A 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" ALIGN_TO() is useful to the GPU debayer logic, move to a shared header to facilitate its reuse. Signed-off-by: Bryan O'Donoghue --- include/libcamera/base/utils.h | 3 +++ src/android/metadata/camera_metadata.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/libcamera/base/utils.h b/include/libcamera/base/utils.h index f21c6dc016ece00e9842ad17ae4dd036fb5683c2..a0d3ffc27804d27c6b225d7da8c74feb3c261f3d 100644 --- a/include/libcamera/base/utils.h +++ b/include/libcamera/base/utils.h @@ -33,6 +33,9 @@ #endif +#define ALIGN_TO(val, alignment) \ + (((uintptr_t)(val) + ((alignment) - 1)) & ~((alignment) - 1)) + namespace libcamera { namespace utils { diff --git a/src/android/metadata/camera_metadata.c b/src/android/metadata/camera_metadata.c index b86586a7e6857a0920234ea312eb5181b27c3ac0..4fafb54076a4a4be41a31f5ce3bd8c74bf649f59 100644 --- a/src/android/metadata/camera_metadata.c +++ b/src/android/metadata/camera_metadata.c @@ -24,6 +24,7 @@ */ #define ALOGE(...) fprintf(stderr, LOG_TAG __VA_ARGS__) +#include #include #include @@ -39,9 +40,6 @@ #define NOT_FOUND (-ENOENT) #define SN_EVENT_LOG_ID 0x534e4554 -#define ALIGN_TO(val, alignment) \ - (((uintptr_t)(val) + ((alignment) - 1)) & ~((alignment) - 1)) - /** * A single metadata entry, storing an array of values of a given type. If the * array is no larger than 4 bytes in size, it is stored in the data.value[]