[RFC,v1,09/23] libcamera: ipa_data_serializer: Support `MetadataListPlan`
diff mbox series

Message ID 20250606164156.1442682-10-barnabas.pocze@ideasonboard.com
State New
Headers show
Series
  • libcamera: Add `MetadataList`
Related show

Commit Message

Barnabás Pőcze June 6, 2025, 4:41 p.m. UTC 
Define the type in `core.mojom` with external (de)serialization, and
add the necessary `IPADataSerializer` template specialization.

Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
---
 include/libcamera/ipa/core.mojom              |  1 +
 src/libcamera/ipa_data_serializer.cpp         | 84 +++++++++++++++++++
 .../core_ipa_interface.h.tmpl                 |  1 +
 3 files changed, 86 insertions(+)

Patch
diff mbox series 

diff --git a/include/libcamera/ipa/core.mojom b/include/libcamera/ipa/core.mojom
index bce797245..754e4065c 100644
--- a/include/libcamera/ipa/core.mojom
+++ b/include/libcamera/ipa/core.mojom
@@ -83,6 +83,7 @@  module libcamera;
 [skipSerdes, skipHeader] struct ControlInfoMap {};
 [skipSerdes, skipHeader] struct ControlList {};
 [skipSerdes, skipHeader] struct SharedFD {};
+[skipSerdes, skipHeader] struct MetadataListPlan {};
 
 [skipHeader] struct Point {
 	int32 x;
diff --git a/src/libcamera/ipa_data_serializer.cpp b/src/libcamera/ipa_data_serializer.cpp
index 0537f785b..4646f4aa9 100644
--- a/src/libcamera/ipa_data_serializer.cpp
+++ b/src/libcamera/ipa_data_serializer.cpp
@@ -11,6 +11,8 @@ 
 
 #include <libcamera/base/log.h>
 
+#include <libcamera/metadata_list_plan.h>
+
 #include "libcamera/internal/byte_stream_buffer.h"
 
 /**
@@ -620,6 +622,88 @@  IPADataSerializer<FrameBuffer::Plane>::deserialize(const std::vector<uint8_t> &d
 	return deserialize(data.cbegin(), data.end(), fds.cbegin(), fds.end(), cs);
 }
 
+template<>
+std::tuple<std::vector<uint8_t>, std::vector<SharedFD>>
+IPADataSerializer<MetadataListPlan>::serialize([[maybe_unused]] const MetadataListPlan &data,
+					       [[maybe_unused]] ControlSerializer *cs)
+{
+	std::vector<uint8_t> dataVec;
+
+	appendPOD<uint32_t>(dataVec, data.size());
+
+	for (auto &&[tag, e] : data) {
+		appendPOD<uint32_t>(dataVec, tag);
+		appendPOD<uint32_t>(dataVec, e.size);
+		appendPOD<uint32_t>(dataVec, e.alignment);
+		appendPOD<uint8_t>(dataVec, e.type);
+		appendPOD<uint8_t>(dataVec, e.isArray);
+	}
+
+	return { dataVec, {} };
+}
+
+template<>
+MetadataListPlan
+IPADataSerializer<MetadataListPlan>::deserialize([[maybe_unused]] std::vector<uint8_t>::const_iterator dataBegin,
+						 [[maybe_unused]] std::vector<uint8_t>::const_iterator dataEnd,
+						 [[maybe_unused]] std::vector<SharedFD>::const_iterator fdsBegin,
+						 [[maybe_unused]] std::vector<SharedFD>::const_iterator fdsEnd,
+						 [[maybe_unused]] ControlSerializer *cs)
+{
+	MetadataListPlan ret;
+	std::size_t offset = 0;
+
+	auto count = readPOD<uint32_t>(dataBegin, 0, dataEnd);
+	offset += sizeof(count);
+
+	while (count--) {
+		auto tag = readPOD<uint32_t>(dataBegin, offset, dataEnd);
+		offset += sizeof(tag);
+
+		auto size = readPOD<uint32_t>(dataBegin, offset, dataEnd);
+		offset += sizeof(size);
+
+		auto alignment = readPOD<uint32_t>(dataBegin, offset, dataEnd);
+		offset += sizeof(alignment);
+
+		auto type = readPOD<uint8_t>(dataBegin, offset, dataEnd);
+		offset += sizeof(type);
+
+		auto isArray = readPOD<uint8_t>(dataBegin, offset, dataEnd);
+		offset += sizeof(isArray);
+
+		ret.add(tag, size, 1, alignment, static_cast<ControlType>(type), isArray);
+	}
+
+	return ret;
+}
+
+template<>
+MetadataListPlan
+IPADataSerializer<MetadataListPlan>::deserialize(std::vector<uint8_t>::const_iterator dataBegin,
+						 std::vector<uint8_t>::const_iterator dataEnd,
+						 ControlSerializer *cs)
+{
+	return deserialize(dataBegin, dataEnd, {}, {}, cs);
+}
+
+template<>
+MetadataListPlan
+IPADataSerializer<MetadataListPlan>::deserialize(const std::vector<uint8_t> &data,
+						 ControlSerializer *cs)
+{
+	return deserialize(data.cbegin(), data.end(), cs);
+}
+
+template<>
+MetadataListPlan
+IPADataSerializer<MetadataListPlan>::deserialize(const std::vector<uint8_t> &data,
+						 const std::vector<SharedFD> &fds,
+						 ControlSerializer *cs)
+{
+	return deserialize(data.cbegin(), data.end(), fds.cbegin(), fds.end(), cs);
+}
+
 #endif /* __DOXYGEN__ */
 
 } /* namespace libcamera */
diff --git a/utils/codegen/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl b/utils/codegen/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl
index 3942e5708..b3774cd64 100644
--- a/utils/codegen/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl
+++ b/utils/codegen/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl
@@ -21,6 +21,7 @@ 
 #include <libcamera/controls.h>
 #include <libcamera/framebuffer.h>
 #include <libcamera/geometry.h>
+#include <libcamera/metadata_list_plan.h>
 
 #include <libcamera/ipa/ipa_interface.h>