PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: Rename YamlObject to ValueNode

Browse Source 
The YamlObject class is now a generic data container to model trees of
values. Rename it to ValueNode and expand the class documentation.

While at it, drop the unneeded libcamera:: namespace prefix when using
the ValueNode class.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
2026-04-24 18:08:25 +03:00
parent 9be3ed8104
commit 554c5c7fa1
134 changed files with 813 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/android/camera_hal_config.cpp
+8 -8
View File
@@ -30,9 +30,9 @@ public:
int parseConfigFile(File &file, std::map<std::string, CameraConfigData> *cameras);
private:
int parseCameraConfigData(const std::string &cameraId, const YamlObject &);
int parseLocation(const YamlObject &, CameraConfigData &cameraConfigData);
int parseRotation(const YamlObject &, CameraConfigData &cameraConfigData);
int parseCameraConfigData(const std::string &cameraId, const ValueNode &);
int parseLocation(const ValueNode &, CameraConfigData &cameraConfigData);
int parseRotation(const ValueNode &, CameraConfigData &cameraConfigData);
std::map<std::string, CameraConfigData> *cameras_;
};
@@ -65,7 +65,7 @@ int CameraHalConfig::Private::parseConfigFile(File &file,
cameras_ = cameras;
std::unique_ptr<YamlObject> root = YamlParser::parse(file);
std::unique_ptr<ValueNode> root = YamlParser::parse(file);
if (!root)
return -EINVAL;
@@ -76,7 +76,7 @@ int CameraHalConfig::Private::parseConfigFile(File &file,
if (!root->contains("cameras"))
return -EINVAL;
const YamlObject &yamlObjectCameras = (*root)["cameras"];
const ValueNode &yamlObjectCameras = (*root)["cameras"];
if (!yamlObjectCameras.isDictionary())
return -EINVAL;
@@ -90,7 +90,7 @@ int CameraHalConfig::Private::parseConfigFile(File &file,
}
int CameraHalConfig::Private::parseCameraConfigData(const std::string &cameraId,
const YamlObject &cameraObject)
const ValueNode &cameraObject)
{
if (!cameraObject.isDictionary())
@@ -109,7 +109,7 @@ int CameraHalConfig::Private::parseCameraConfigData(const std::string &cameraId,
return 0;
}
int CameraHalConfig::Private::parseLocation(const YamlObject &cameraObject,
int CameraHalConfig::Private::parseLocation(const ValueNode &cameraObject,
CameraConfigData &cameraConfigData)
{
if (!cameraObject.contains("location"))
@@ -127,7 +127,7 @@ int CameraHalConfig::Private::parseLocation(const YamlObject &cameraObject,
return 0;
}
int CameraHalConfig::Private::parseRotation(const YamlObject &cameraObject,
int CameraHalConfig::Private::parseRotation(const ValueNode &cameraObject,
CameraConfigData &cameraConfigData)
{
if (!cameraObject.contains("rotation"))