[PATCH v3 8/9] rkisp1: Use Matrix class from libcamera

Stefan Klug stefan.klug at ideasonboard.com
Wed Nov 20 15:27:55 CET 2024


Use the Matrix class from libcamera/internal in the rkisp IPA so that
the libipa one can be dropped later.

Signed-off-by: Stefan Klug <stefan.klug at ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
 src/ipa/rkisp1/algorithms/ccm.h | 3 ++-
 src/ipa/rkisp1/ipa_context.h    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ipa/rkisp1/algorithms/ccm.h b/src/ipa/rkisp1/algorithms/ccm.h
index 46a1416e6be5..a5d9a9a45e5d 100644
--- a/src/ipa/rkisp1/algorithms/ccm.h
+++ b/src/ipa/rkisp1/algorithms/ccm.h
@@ -9,8 +9,9 @@
 
 #include <linux/rkisp1-config.h>
 
+#include "libcamera/internal/matrix.h"
+
 #include "libipa/interpolator.h"
-#include "libipa/matrix.h"
 
 #include "algorithm.h"
 
diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h
index 7b93a9e9461d..12b37d1c73b0 100644
--- a/src/ipa/rkisp1/ipa_context.h
+++ b/src/ipa/rkisp1/ipa_context.h
@@ -21,10 +21,10 @@
 #include <libcamera/ipa/core_ipa_interface.h>
 
 #include "libcamera/internal/debug_controls.h"
+#include "libcamera/internal/matrix.h"
 
 #include <libipa/camera_sensor_helper.h>
 #include <libipa/fc_queue.h>
-#include <libipa/matrix.h>
 
 namespace libcamera {
 
-- 
2.43.0



More information about the libcamera-devel mailing list