[PATCH v2 2/2] libcamera: formats: Deduplicate PixelFormatInfo::info() code

Stefan Klug stefan.klug at ideasonboard.com
Fri Feb 14 17:09:48 CET 2025


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 <stefan.klug at ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
 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);
 }
 
 /**
-- 
2.43.0



More information about the libcamera-devel mailing list