From patchwork Fri Feb 14 16:09:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 22782 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 866BAC3272 for ; Fri, 14 Feb 2025 16:10:41 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 25CEF68650; Fri, 14 Feb 2025 17:10:41 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="ugX0qFLm"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C19D16862A for ; Fri, 14 Feb 2025 17:10:38 +0100 (CET) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:2ff9:b837:9e53:886e]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 776C1710; Fri, 14 Feb 2025 17:09:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1739549359; bh=m8DofvAuWViov47QG7Wt4lYGkBGqd+j3nVw/MjwTsUA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ugX0qFLmjXiQLoIlPvGZ5iHgc0U4UcTygZMJUJjYHePCKC1uho/mf5I8vuqeEMt4y F1/wYyYB7nmohg2tLua0MHtYashncAZgEirBh0k0Dis5nvInLHmpcSdDVg9YKJTaPL Z5gjLdiGZN4d1kRHwIhqfYyb0IJ53LtW2ZTlJ808= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug , Kieran Bingham , Laurent Pinchart Subject: [PATCH v2 1/2] libcamera: formats: Silence warning when creating a PixelFormatInfo from a null format Date: Fri, 14 Feb 2025 17:09:47 +0100 Message-ID: <20250214161031.240481-2-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250214161031.240481-1-stefan.klug@ideasonboard.com> References: <20250214161031.240481-1-stefan.klug@ideasonboard.com> 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" Calling PixelFormat().toString() correctly returns "0x0-" but it also produces the following, possibly confusing, warning: WARN Formats formats.cpp:1006 Unsupported pixel format 0x00000000 Silence the warning in PixelFormatInfo::info() in case the format is invalid. Signed-off-by: Stefan Klug Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/libcamera/formats.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp index bfcdfc08960d..b4518e61d04a 100644 --- a/src/libcamera/formats.cpp +++ b/src/libcamera/formats.cpp @@ -1001,6 +1001,9 @@ const std::map pixelFormatInfo{ */ const PixelFormatInfo &PixelFormatInfo::info(const PixelFormat &format) { + if (!format.isValid()) + return pixelFormatInfoInvalid; + const auto iter = pixelFormatInfo.find(format); if (iter == pixelFormatInfo.end()) { LOG(Formats, Warning) From patchwork Fri Feb 14 16:09:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 22783 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 7F875C3272 for ; Fri, 14 Feb 2025 16:10:44 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3BCE368653; Fri, 14 Feb 2025 17:10:44 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="QUQCw4rn"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E2AB968648 for ; Fri, 14 Feb 2025 17:10:40 +0100 (CET) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:2ff9:b837:9e53:886e]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 994A010C7; Fri, 14 Feb 2025 17:09:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1739549361; bh=7Ok4/3Ga4nvZ8nOUJ6xGdViQjK7GhgFDLhXvG5IQoqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QUQCw4rnw26nK3pIGWPpIbMWa9kwbca9nlaRjvDuYnxhTET4pEN3M6S8CeRWpcAkY yVqx88gAXNVIbITMbzH9ETa7FToyAAHBxkPVWLiIjGPjl0y/bWLX7A+xnEDlCpT5qs WM27QOOktCo934m0QK5sHEoOiCxzv6lBY+EvleXI= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug , Kieran Bingham , Laurent Pinchart Subject: [PATCH v2 2/2] libcamera: formats: Deduplicate PixelFormatInfo::info() code Date: Fri, 14 Feb 2025 17:09:48 +0100 Message-ID: <20250214161031.240481-3-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250214161031.240481-1-stefan.klug@ideasonboard.com> References: <20250214161031.240481-1-stefan.klug@ideasonboard.com> 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" Use PixelFormatInfo::info(const PixelFormat &format) to implement PixelFormatInfo::info(const V4L2PixelFormat &format). This has one noteworthy side effect: If info(V4L2PixelFormat &format) is called with a valid but unsupported (by libcamera) format, we now get the same warning as in the info(PixelFormat &format) case. Signed-off-by: Stefan Klug Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/libcamera/formats.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp index b4518e61d04a..df7413f58ba8 100644 --- a/src/libcamera/formats.cpp +++ b/src/libcamera/formats.cpp @@ -1024,14 +1024,7 @@ const PixelFormatInfo &PixelFormatInfo::info(const PixelFormat &format) const PixelFormatInfo &PixelFormatInfo::info(const V4L2PixelFormat &format) { PixelFormat pixelFormat = format.toPixelFormat(false); - if (!pixelFormat.isValid()) - return pixelFormatInfoInvalid; - - const auto iter = pixelFormatInfo.find(pixelFormat); - if (iter == pixelFormatInfo.end()) - return pixelFormatInfoInvalid; - - return iter->second; + return info(pixelFormat); } /**