From bc0318e8c88399780d7e6944ed56acf83b0ff2d6 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sun, 19 Oct 2025 02:42:35 +0300
Subject: [PATCH] libcamera: yaml_parser: Move Size handling to geometry.cpp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The YamlObject::Accessor structure is designed to extend the YamlObject
class with new getter and setter types without modifying
yaml_parser.cpp. This feature is used for various libcamera classes,
while standard C++ types are handled in yaml_parser.cpp.

The Size class is an outlier: it is a libcamera class, but is handled in
yaml_parser.cpp. Move it to geometry.cpp. Drop the std::vector<Size>
specialization as it is currently unused.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Isaac Scott <isaac.scott@ideasonboard.com>
---
 include/libcamera/internal/yaml_parser.h |  2 --
 src/ipa/libipa/lsc_polynomial.h          |  2 ++
 src/libcamera/geometry.cpp               | 29 ++++++++++++++++++++++++
 src/libcamera/yaml_parser.cpp            | 22 ------------------
 test/yaml-parser.cpp                     |  2 ++
 5 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/include/libcamera/internal/yaml_parser.h b/include/libcamera/internal/yaml_parser.h
index c41397df..7707e746 100644
--- a/include/libcamera/internal/yaml_parser.h
+++ b/include/libcamera/internal/yaml_parser.h
@@ -17,8 +17,6 @@
 
 #include <libcamera/base/class.h>
 
-#include <libcamera/geometry.h>
-
 namespace libcamera {
 
 class File;
diff --git a/src/ipa/libipa/lsc_polynomial.h b/src/ipa/libipa/lsc_polynomial.h
index df3a0d4b..c71f215d 100644
--- a/src/ipa/libipa/lsc_polynomial.h
+++ b/src/ipa/libipa/lsc_polynomial.h
@@ -14,6 +14,8 @@
 #include <libcamera/base/log.h>
 #include <libcamera/base/span.h>
 
+#include <libcamera/geometry.h>
+
 #include "libcamera/internal/yaml_parser.h"
 
 namespace libcamera {
diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp
index 2763967a..2e8e9e33 100644
--- a/src/libcamera/geometry.cpp
+++ b/src/libcamera/geometry.cpp
@@ -12,6 +12,8 @@
 
 #include <libcamera/base/log.h>
 
+#include "libcamera/internal/yaml_parser.h"
+
 /**
  * \file geometry.h
  * \brief Data structures related to geometric objects
@@ -924,4 +926,31 @@ std::ostream &operator<<(std::ostream &out, const Rectangle &r)
 	return out;
 }
 
+#ifndef __DOXYGEN__
+/*
+ * The YAML data shall be a list of two numerical values containing the x and y
+ * coordinates, in that order.
+ */
+template<>
+std::optional<Size>
+YamlObject::Accessor<Size>::get(const YamlObject &obj) const
+{
+	if (obj.type_ != Type::List)
+		return std::nullopt;
+
+	if (obj.list_.size() != 2)
+		return std::nullopt;
+
+	auto width = obj.list_[0].value->get<uint32_t>();
+	if (!width)
+		return std::nullopt;
+
+	auto height = obj.list_[1].value->get<uint32_t>();
+	if (!height)
+		return std::nullopt;
+
+	return Size(*width, *height);
+}
+#endif /* __DOXYGEN__ */
+
 } /* namespace libcamera */
diff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp
index ab24f178..00c0372c 100644
--- a/src/libcamera/yaml_parser.cpp
+++ b/src/libcamera/yaml_parser.cpp
@@ -286,27 +286,6 @@ void YamlObject::Accessor<std::string>::set(YamlObject &obj, std::string value)
 	obj.value_ = std::move(value);
 }
 
-template<>
-std::optional<Size>
-YamlObject::Accessor<Size>::get(const YamlObject &obj) const
-{
-	if (obj.type_ != Type::List)
-		return std::nullopt;
-
-	if (obj.list_.size() != 2)
-		return std::nullopt;
-
-	auto width = obj.list_[0].value->get<uint32_t>();
-	if (!width)
-		return std::nullopt;
-
-	auto height = obj.list_[1].value->get<uint32_t>();
-	if (!height)
-		return std::nullopt;
-
-	return Size(*width, *height);
-}
-
 template<typename T>
 struct YamlObject::Accessor<std::vector<T>> {
 	std::optional<std::vector<T>> get(const YamlObject &obj) const
@@ -338,7 +317,6 @@ template struct YamlObject::Accessor<std::vector<uint16_t>>;
 template struct YamlObject::Accessor<std::vector<int32_t>>;
 template struct YamlObject::Accessor<std::vector<uint32_t>>;
 template struct YamlObject::Accessor<std::vector<std::string>>;
-template struct YamlObject::Accessor<std::vector<Size>>;
 #endif /* __DOXYGEN__ */
 
 /**
diff --git a/test/yaml-parser.cpp b/test/yaml-parser.cpp
index 566401af..01e734d2 100644
--- a/test/yaml-parser.cpp
+++ b/test/yaml-parser.cpp
@@ -14,6 +14,8 @@
 #include <libcamera/base/file.h>
 #include <libcamera/base/utils.h>
 
+#include <libcamera/geometry.h>
+
 #include "libcamera/internal/yaml_parser.h"
 
 #include "test.h"