From cbdc93e9d1666010d49e06940158a37c61cc6fa7 Mon Sep 17 00:00:00 2001
From: Kieran Bingham <kieran.bingham@ideasonboard.com>
Date: Tue, 15 Jun 2021 15:40:45 +0100
Subject: libcamera/base: Move utils to the base library
Move the utils functionality to the libcamera/base library.
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
src/ipa/raspberrypi/cam_helper.hpp | 3 ++-
src/ipa/raspberrypi/controller/agc_algorithm.hpp | 3 ++-
src/ipa/raspberrypi/controller/agc_status.h | 2 +-
src/ipa/raspberrypi/controller/camera_mode.h | 2 +-
src/ipa/raspberrypi/controller/device_status.h | 2 +-
src/ipa/raspberrypi/controller/rpi/agc.hpp | 2 +-
src/ipa/raspberrypi/controller/rpi/lux.hpp | 2 +-
7 files changed, 9 insertions(+), 7 deletions(-)
(limited to 'src/ipa/raspberrypi')
diff --git a/src/ipa/raspberrypi/cam_helper.hpp b/src/ipa/raspberrypi/cam_helper.hpp
index f53f5c39..221898ce 100644
--- a/src/ipa/raspberrypi/cam_helper.hpp
+++ b/src/ipa/raspberrypi/cam_helper.hpp
@@ -15,7 +15,8 @@
#include "controller/metadata.hpp"
#include "md_parser.hpp"
-#include "libcamera/internal/utils.h"
+#include <libcamera/base/utils.h>
+
#include "libcamera/internal/v4l2_videodevice.h"
namespace RPiController {
diff --git a/src/ipa/raspberrypi/controller/agc_algorithm.hpp b/src/ipa/raspberrypi/controller/agc_algorithm.hpp
index 134bbcda..61595ea2 100644
--- a/src/ipa/raspberrypi/controller/agc_algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/agc_algorithm.hpp
@@ -6,7 +6,8 @@
*/
#pragma once
-#include "libcamera/internal/utils.h"
+#include <libcamera/base/utils.h>
+
#include "algorithm.hpp"
namespace RPiController {
diff --git a/src/ipa/raspberrypi/controller/agc_status.h b/src/ipa/raspberrypi/controller/agc_status.h
index 5d50e177..20cb1b62 100644
--- a/src/ipa/raspberrypi/controller/agc_status.h
+++ b/src/ipa/raspberrypi/controller/agc_status.h
@@ -6,7 +6,7 @@
*/
#pragma once
-#include "libcamera/internal/utils.h"
+#include <libcamera/base/utils.h>
// The AGC algorithm should post the following structure into the image's
// "agc.status" metadata.
diff --git a/src/ipa/raspberrypi/controller/camera_mode.h b/src/ipa/raspberrypi/controller/camera_mode.h
index 2aa2335d..65888230 100644
--- a/src/ipa/raspberrypi/controller/camera_mode.h
+++ b/src/ipa/raspberrypi/controller/camera_mode.h
@@ -8,7 +8,7 @@
#include <libcamera/transform.h>
-#include "libcamera/internal/utils.h"
+#include <libcamera/base/utils.h>
// Description of a "camera mode", holding enough information for control
// algorithms to adapt their behaviour to the different modes of the camera,
diff --git a/src/ipa/raspberrypi/controller/device_status.h b/src/ipa/raspberrypi/controller/device_status.h
index 131b4cd3..f7423524 100644
--- a/src/ipa/raspberrypi/controller/device_status.h
+++ b/src/ipa/raspberrypi/controller/device_status.h
@@ -6,7 +6,7 @@
*/
#pragma once
-#include "libcamera/internal/utils.h"
+#include <libcamera/base/utils.h>
// Definition of "device metadata" which stores things like shutter time and
// analogue gain that downstream control algorithms will want to know.
diff --git a/src/ipa/raspberrypi/controller/rpi/agc.hpp b/src/ipa/raspberrypi/controller/rpi/agc.hpp
index 75078948..85067dc6 100644
--- a/src/ipa/raspberrypi/controller/rpi/agc.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/agc.hpp
@@ -9,7 +9,7 @@
#include <vector>
#include <mutex>
-#include "libcamera/internal/utils.h"
+#include <libcamera/base/utils.h>
#include "../agc_algorithm.hpp"
#include "../agc_status.h"
diff --git a/src/ipa/raspberrypi/controller/rpi/lux.hpp b/src/ipa/raspberrypi/controller/rpi/lux.hpp
index 45c84439..3ebd35d1 100644
--- a/src/ipa/raspberrypi/controller/rpi/lux.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/lux.hpp
@@ -8,7 +8,7 @@
#include <mutex>
-#include "libcamera/internal/utils.h"
+#include <libcamera/base/utils.h>
#include "../lux_status.h"
#include "../algorithm.hpp"
--
cgit v1.2.1