From patchwork Wed Feb 12 11:29:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 22777 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 0B5BFC3304 for ; Wed, 12 Feb 2025 11:33:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3775E6862C; Wed, 12 Feb 2025 12:33:37 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="V+8Tf0bx"; 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 0AD5E685FF for ; Wed, 12 Feb 2025 12:33:35 +0100 (CET) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:533:2ab9:67b7:5f65]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 195AC455; Wed, 12 Feb 2025 12:32:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1739359937; bh=5YsL9j9Q1/mW3Kn/Liq0D75xrnFAMXDm57H6ZO93YOM=; h=From:To:Cc:Subject:Date:From; b=V+8Tf0bxYBIqcscF6UnE7a7ug+AC+ODK+RiPoeHsXZ8L/6jRbEJVgU1KzEh0Y/TBq ArzdKGZMR9wzZtOSCGZrJeSrw3RU9wVXVX7De/JyCxPRIhB+mlNLM2sLoLMGNvQAOO FdxD9MwYWLzqWxsD7RRcvKvRGZOFJMqRvMw2m7Qk= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug Subject: [PATCH] libcamera: formats: Silence warning when creating a PixelFormatInfo from a null format Date: Wed, 12 Feb 2025 12:29:42 +0100 Message-ID: <20250212113328.304528-1-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.43.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" 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. While at it, remove code duplication by using PixelFormatInfo::info(const PixelFormat &format) to implement PixelFormatInfo::info(const V4L2PixelFormat &format). Signed-off-by: Stefan Klug Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- Hi all, The attached patch 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. I believe that is sensible but maybe the warning was left off in the V4L2 case on purpose. Best regards, Stefan src/libcamera/formats.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp index bfcdfc08960d..df7413f58ba8 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) @@ -1021,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); } /**