[PATCH resend 3/5] libcamera: swstats_cpu: Move header to libcamera/internal/software_isp

Hans de Goede hdegoede at redhat.com
Thu Dec 5 20:25:17 CET 2024


Move the swstats_cpu.h file to include/libcamera/internal/software_isp/
so that it can be used outside the src/libcamera/software_isp/ directory.

Reviewed-by: Milan Zamazal <mzamazal at redhat.com>
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
---
 include/libcamera/internal/software_isp/meson.build             | 1 +
 .../libcamera/internal}/software_isp/swstats_cpu.h              | 0
 src/libcamera/software_isp/debayer_cpu.h                        | 2 +-
 src/libcamera/software_isp/swstats_cpu.cpp                      | 2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)
 rename {src/libcamera => include/libcamera/internal}/software_isp/swstats_cpu.h (100%)

diff --git a/include/libcamera/internal/software_isp/meson.build b/include/libcamera/internal/software_isp/meson.build
index 508ddddc..ea3f3f1c 100644
--- a/include/libcamera/internal/software_isp/meson.build
+++ b/include/libcamera/internal/software_isp/meson.build
@@ -4,4 +4,5 @@ libcamera_internal_headers += files([
     'debayer_params.h',
     'software_isp.h',
     'swisp_stats.h',
+    'swstats_cpu.h',
 ])
diff --git a/src/libcamera/software_isp/swstats_cpu.h b/include/libcamera/internal/software_isp/swstats_cpu.h
similarity index 100%
rename from src/libcamera/software_isp/swstats_cpu.h
rename to include/libcamera/internal/software_isp/swstats_cpu.h
diff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h
index 2c47e7c6..feb0452e 100644
--- a/src/libcamera/software_isp/debayer_cpu.h
+++ b/src/libcamera/software_isp/debayer_cpu.h
@@ -18,9 +18,9 @@
 #include <libcamera/base/object.h>
 
 #include "libcamera/internal/bayer_format.h"
+#include "libcamera/internal/software_isp/swstats_cpu.h"
 
 #include "debayer.h"
-#include "swstats_cpu.h"
 
 namespace libcamera {
 
diff --git a/src/libcamera/software_isp/swstats_cpu.cpp b/src/libcamera/software_isp/swstats_cpu.cpp
index 5e4246a9..aa5654dc 100644
--- a/src/libcamera/software_isp/swstats_cpu.cpp
+++ b/src/libcamera/software_isp/swstats_cpu.cpp
@@ -9,7 +9,7 @@
  * CPU based software statistics implementation
  */
 
-#include "swstats_cpu.h"
+#include "libcamera/internal/software_isp/swstats_cpu.h"
 
 #include <libcamera/base/log.h>
 
-- 
2.47.0



More information about the libcamera-devel mailing list