Merge branch 'master' into next

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>

Author: naushir

Documentation/guides/application-developer.rst

@@ -279,7 +279,7 @@ as the parameter of the ``FrameBufferAllocator::buffers()`` function.
 
 .. code:: cpp
 
-   FrameBufferAllocator *allocator = new FrameBufferAllocator(camera);
+   auto allocator = std::make_unique<FrameBufferAllocator>(camera);
 
    for (StreamConfiguration &cfg : *config) {
        int ret = allocator->allocate(cfg.stream());
@@ -539,7 +539,7 @@ uses, so needs to do the following:
 
    camera->stop();
    allocator->free(stream);
-   delete allocator;
+   allocator.reset();
    camera->release();
    camera.reset();
    cm->stop();

Documentation/guides/ipa.rst

@@ -387,20 +387,20 @@ In the pipeline handler, we first need to construct a specialized IPA proxy.
 From the point of view of the pipeline hander, this is the object that is the
 IPA.
 
-To do so, we invoke the IPAManager:
+To do so, we call the PipelineHandler::createIPA() function:
 
 .. code-block:: C++
 
         std::unique_ptr<ipa::rpi::IPAProxyRPi> ipa_ =
-                IPAManager::createIPA<ipa::rpi::IPAProxyRPi>(pipe_, 1, 1);
+                pipe_->createIPA<ipa::rpi::IPAProxyRPi>(1, 1);
 
 The ipa::rpi namespace comes from the namespace that we defined in the mojo
 data definition file, in the "Namespacing" section. The name of the proxy,
 IPAProxyRPi, comes from the name given to the main IPA interface,
 IPARPiInterface, in the "The Main IPA interface" section.
 
-The return value of IPAManager::createIPA shall be error-checked, to confirm
-that the returned pointer is not a nullptr.
+The return value of createIPA() shall be error-checked, to confirm that the
+returned pointer is not a nullptr.
 
 After this, before initializing the IPA, slots should be connected to all of
 the IPA's signals, as defined in the Event IPA interface:

Documentation/runtime_configuration.rst

@@ -89,8 +89,8 @@ Configuration file example
        mode: gpu
        threads: 2
 
-List of variables and configuration options
--------------------------------------------
+List of environment variables and configuration options
+-------------------------------------------------------
 
 LIBCAMERA_LOG_FILE
    The custom destination for log output.

REUSE.toml

@@ -39,3 +39,11 @@ path = [
 precedence = "aggregate"
 SPDX-FileCopyrightText = "Copyright 2013-2020 The Chromium Authors. All rights reserved."
 SPDX-License-Identifier = "BSD-3-Clause"
+
+[[annotations]]
+path = [
+	"utils/tuning/libtuning/macbeth_ref.pgm",
+]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2019-2020 Raspberry Pi Ltd"
+SPDX-License-Identifier = "BSD-2-Clause"

include/libcamera/base/utils.h

@@ -37,6 +37,15 @@ namespace libcamera {
 
 namespace utils {
 
+template<class... Ts>
+struct overloaded : Ts... {
+	using Ts::operator()...;
+};
+#ifndef __DOXYGEN__
+template<class... Ts>
+overloaded(Ts...) -> overloaded<Ts...>;
+#endif
+
 const char *basename(const char *path);
 
 char *secure_getenv(const char *name);

include/libcamera/internal/converter/converter_dw100.h

@@ -31,7 +31,7 @@ class ConverterDW100Module
 
 	static std::unique_ptr<ConverterDW100Module> createModule(DeviceEnumerator *enumerator);
 
-	int init(const YamlObject &params);
+	int init(const ValueNode &params);
 
 	int configure(const StreamConfiguration &inputCfg,
 		      const std::vector<std::reference_wrapper<const StreamConfiguration>>

include/libcamera/internal/device_enumerator_udev.h

@@ -69,7 +69,7 @@ class DeviceEnumeratorUdev final : public DeviceEnumerator
 
 	struct udev *udev_;
 	struct udev_monitor *monitor_;
-	EventNotifier *notifier_;
+	std::unique_ptr<EventNotifier> notifier_;
 
 	std::set<dev_t> orphans_;
 	std::unordered_set<dev_t> devices_;

include/libcamera/internal/egl.h

@@ -88,7 +88,6 @@ class eGLImage
 	GLenum texture_unit_; /**< Texture unit associated with this image eg (GL_TEXTURE0) */
 	GLuint texture_; /**< OpenGL texture object ID */
 	GLuint fbo_; /**< OpenGL frame buffer object ID */
-	EGLImageKHR image_; /**< EGL Image handle */
 
 private:
 	LIBCAMERA_DISABLE_COPY_AND_MOVE(eGLImage)
@@ -104,7 +103,6 @@ class eGL
 
 	int createInputDMABufTexture2D(eGLImage &eglImage, int fd);
 	int createOutputDMABufTexture2D(eGLImage &eglImage, int fd);
-	void destroyDMABufTexture(eGLImage &eglImage);
 	void createTexture2D(eGLImage &eglImage, GLint format, uint32_t width, uint32_t height, void *data);
 
 	void pushEnv(std::vector<std::string> &shaderEnv, const char *str);

include/libcamera/internal/global_configuration.h

@@ -8,31 +8,30 @@
 #pragma once
 
 #include <filesystem>
+#include <initializer_list>
 #include <optional>
 #include <string>
 #include <string_view>
 
 #include <libcamera/base/utils.h>
 
-#include "libcamera/internal/yaml_parser.h"
+#include "libcamera/internal/value_node.h"
 
 namespace libcamera {
 
 class GlobalConfiguration
 {
 public:
-	using Configuration = const YamlObject &;
-
 	GlobalConfiguration();
 
 	unsigned int version() const;
-	Configuration configuration() const;
+	const ValueNode &configuration() const;
 
 	template<typename T>
 	std::optional<T> option(
 		const std::initializer_list<std::string_view> confPath) const
 	{
-		const YamlObject *c = &configuration();
+		const ValueNode *c = &configuration();
 		for (auto part : confPath) {
 			c = &(*c)[part];
 			if (!*c)
@@ -43,20 +42,13 @@ class GlobalConfiguration
 
 	std::optional<std::vector<std::string>> listOption(
 		const std::initializer_list<std::string_view> confPath) const;
-	std::optional<std::string> envOption(
-		const char *const envVariable,
-		const std::initializer_list<std::string_view> confPath) const;
-	std::optional<std::vector<std::string>> envListOption(
-		const char *const envVariable,
-		const std::initializer_list<std::string_view> confPath,
-		const std::string delimiter = ":") const;
 
 private:
-	bool loadFile(const std::filesystem::path &fileName);
 	void load();
+	bool loadFile(const std::filesystem::path &fileName);
 
-	std::unique_ptr<YamlObject> yamlConfiguration_ =
-		std::make_unique<YamlObject>();
+	std::unique_ptr<ValueNode> configuration_ =
+		std::make_unique<ValueNode>();
 };
 
 } /* namespace libcamera */

include/libcamera/internal/ipa_manager.h

@@ -16,40 +16,36 @@
 #include <libcamera/ipa/ipa_interface.h>
 #include <libcamera/ipa/ipa_module_info.h>
 
-#include "libcamera/internal/camera_manager.h"
-#include "libcamera/internal/global_configuration.h"
-#include "libcamera/internal/ipa_module.h"
-#include "libcamera/internal/pipeline_handler.h"
 #include "libcamera/internal/pub_key.h"
 
 namespace libcamera {
 
 LOG_DECLARE_CATEGORY(IPAManager)
 
+class CameraManager;
+class GlobalConfiguration;
+class IPAModule;
+class PipelineHandler;
+
 class IPAManager
 {
 public:
-	IPAManager(const GlobalConfiguration &configuration);
+	IPAManager(const CameraManager &cm);
 	~IPAManager();
 
 	template<typename T>
-	static std::unique_ptr<T> createIPA(PipelineHandler *pipe,
-					    uint32_t minVersion,
-					    uint32_t maxVersion)
+	std::unique_ptr<T> createIPA(PipelineHandler *pipe, uint32_t minVersion,
+				     uint32_t maxVersion)
 	{
-		CameraManager *cm = pipe->cameraManager();
-		IPAManager *self = cm->_d()->ipaManager();
-		IPAModule *m = self->module(pipe, minVersion, maxVersion);
+		IPAModule *m = module(pipe, minVersion, maxVersion);
 		if (!m)
 			return nullptr;
 
-		const GlobalConfiguration &configuration = cm->_d()->configuration();
-
 		auto proxy = [&]() -> std::unique_ptr<T> {
-			if (self->isSignatureValid(m))
-				return std::make_unique<typename T::Threaded>(m, configuration);
+			if (isSignatureValid(m))
+				return std::make_unique<typename T::Threaded>(m, cm_);
 			else
-				return std::make_unique<typename T::Isolated>(m, configuration);
+				return std::make_unique<typename T::Isolated>(m, cm_);
 		}();
 
 		if (!proxy->isValid()) {
@@ -77,6 +73,7 @@ class IPAManager
 
 	bool isSignatureValid(IPAModule *ipa) const;
 
+	const CameraManager &cm_;
 	std::vector<std::unique_ptr<IPAModule>> modules_;
 
 #if HAVE_IPA_PUBKEY