From patchwork Sat May 15 18:38:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12304 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com 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 E8509C31FB for ; Sat, 15 May 2021 18:38:42 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id EB6AE6891E; Sat, 15 May 2021 20:38:41 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="oK0XEIbA"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0AFE66891B for ; Sat, 15 May 2021 20:38:40 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8BCBA559; Sat, 15 May 2021 20:38:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1621103919; bh=CnncbO62OunficC/7qsarbjsqDtx4b26YIPxesqOXcU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oK0XEIbA8p655M/X/liDJDdgCPtjTcd8hPLQXlgh3Ea3gHwPEVLAgUDwCgLuWOP4a ziyvP/mwix372hZ1NuzMGND0Gb2cxdGqeQw5zVRuFvxxvg7M+ljwCkeJMlpKKU27z4 MOHhal21Nih5F90krdrRVHYvDdoTDO4R9ADTWh8Y= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 15 May 2021 21:38:23 +0300 Message-Id: <20210515183826.21003-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.28.1 In-Reply-To: <20210515183826.21003-1-laurent.pinchart@ideasonboard.com> References: <20210515183826.21003-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/4] android: camera_metadata: Rename sizeofT argument to elementSize 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" The sizeofT argument to CameraMetadata::addEntry() stores the size of one element. Its name is a bit cryptic as the function isn't a template function with a typename T. Rename it to elementSize. Signed-off-by: Laurent Pinchart Reviewed-by: Hirokazu Honda Reviewed-by: Kieran Bingham --- src/android/camera_metadata.cpp | 4 ++-- src/android/camera_metadata.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp index bf8d2781cc21..59366c50cc16 100644 --- a/src/android/camera_metadata.cpp +++ b/src/android/camera_metadata.cpp @@ -110,12 +110,12 @@ bool CameraMetadata::resize(size_t count, size_t size) } bool CameraMetadata::addEntry(uint32_t tag, const void *data, size_t count, - size_t sizeofT) + size_t elementSize) { if (!valid_) return false; - if (!resize(1, count * sizeofT)) { + if (!resize(1, count * elementSize)) { LOG(CameraMetadata, Error) << "Failed to resize"; valid_ = false; return false; diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h index 07afd4b25ae7..56df6f1c9008 100644 --- a/src/android/camera_metadata.h +++ b/src/android/camera_metadata.h @@ -72,7 +72,8 @@ public: return updateEntry(tag, data.data(), data.size()); } - bool addEntry(uint32_t tag, const void *data, size_t count, size_t sizeofT); + bool addEntry(uint32_t tag, const void *data, size_t count, + size_t elementSize); bool updateEntry(uint32_t tag, const void *data, size_t count); camera_metadata_t *get();