diff options
Diffstat (limited to 'src/ipa')
22 files changed, 30 insertions, 27 deletions
diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index 8b4c7351..31a3c006 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -11,6 +11,8 @@ #include <linux/intel-ipu3.h> #include <linux/v4l2-controls.h> +#include <libcamera/base/log.h> + #include <libcamera/buffer.h> #include <libcamera/control_ids.h> #include <libcamera/ipa/ipa_interface.h> @@ -19,7 +21,6 @@ #include <libcamera/request.h> #include "libcamera/internal/buffer.h" -#include "libcamera/internal/log.h" #include "ipu3_agc.h" #include "ipu3_awb.h" diff --git a/src/ipa/ipu3/ipu3_agc.cpp b/src/ipa/ipu3/ipu3_agc.cpp index c476a60d..fd0b70f0 100644 --- a/src/ipa/ipu3/ipu3_agc.cpp +++ b/src/ipa/ipu3/ipu3_agc.cpp @@ -11,9 +11,9 @@ #include <cmath> #include <numeric> -#include <libcamera/ipa/core_ipa_interface.h> +#include <libcamera/base/log.h> -#include "libcamera/internal/log.h" +#include <libcamera/ipa/core_ipa_interface.h> #include "libipa/histogram.h" diff --git a/src/ipa/ipu3/ipu3_awb.cpp b/src/ipa/ipu3/ipu3_awb.cpp index 54ce8e67..9b409c8f 100644 --- a/src/ipa/ipu3/ipu3_awb.cpp +++ b/src/ipa/ipu3/ipu3_awb.cpp @@ -10,7 +10,7 @@ #include <numeric> #include <unordered_map> -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> namespace libcamera { diff --git a/src/ipa/libipa/histogram.cpp b/src/ipa/libipa/histogram.cpp index d4d7cfdf..fb1eb2a2 100644 --- a/src/ipa/libipa/histogram.cpp +++ b/src/ipa/libipa/histogram.cpp @@ -8,7 +8,7 @@ #include <cmath> -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> /** * \file histogram.h diff --git a/src/ipa/raspberrypi/cam_helper.hpp b/src/ipa/raspberrypi/cam_helper.hpp index 221898ce..a6664819 100644 --- a/src/ipa/raspberrypi/cam_helper.hpp +++ b/src/ipa/raspberrypi/cam_helper.hpp @@ -10,13 +10,13 @@ #include <libcamera/span.h> +#include <libcamera/base/utils.h> + #include "camera_mode.h" #include "controller/controller.hpp" #include "controller/metadata.hpp" #include "md_parser.hpp" -#include <libcamera/base/utils.h> - #include "libcamera/internal/v4l2_videodevice.h" namespace RPiController { diff --git a/src/ipa/raspberrypi/controller/controller.cpp b/src/ipa/raspberrypi/controller/controller.cpp index 96b58359..d3433ad2 100644 --- a/src/ipa/raspberrypi/controller/controller.cpp +++ b/src/ipa/raspberrypi/controller/controller.cpp @@ -5,7 +5,7 @@ * controller.cpp - ISP controller */ -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> #include "algorithm.hpp" #include "controller.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp index 55e80ac7..1ed578cf 100644 --- a/src/ipa/raspberrypi/controller/rpi/agc.cpp +++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp @@ -9,7 +9,7 @@ #include "linux/bcm2835-isp.h" -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> #include "../awb_status.h" #include "../device_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/alsc.cpp b/src/ipa/raspberrypi/controller/rpi/alsc.cpp index b0d24aa2..3cdc95a9 100644 --- a/src/ipa/raspberrypi/controller/rpi/alsc.cpp +++ b/src/ipa/raspberrypi/controller/rpi/alsc.cpp @@ -6,7 +6,7 @@ */ #include <math.h> -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> #include "../awb_status.h" #include "alsc.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/awb.cpp b/src/ipa/raspberrypi/controller/rpi/awb.cpp index 1c917e4f..5cfd33a3 100644 --- a/src/ipa/raspberrypi/controller/rpi/awb.cpp +++ b/src/ipa/raspberrypi/controller/rpi/awb.cpp @@ -5,7 +5,7 @@ * awb.cpp - AWB control algorithm */ -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> #include "../lux_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/black_level.cpp b/src/ipa/raspberrypi/controller/rpi/black_level.cpp index 9ac855f5..6b3497f1 100644 --- a/src/ipa/raspberrypi/controller/rpi/black_level.cpp +++ b/src/ipa/raspberrypi/controller/rpi/black_level.cpp @@ -8,7 +8,7 @@ #include <math.h> #include <stdint.h> -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> #include "../black_level_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/ccm.cpp b/src/ipa/raspberrypi/controller/rpi/ccm.cpp index dbdcbb39..821a4c7c 100644 --- a/src/ipa/raspberrypi/controller/rpi/ccm.cpp +++ b/src/ipa/raspberrypi/controller/rpi/ccm.cpp @@ -5,7 +5,7 @@ * ccm.cpp - CCM (colour correction matrix) control algorithm */ -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> #include "../awb_status.h" #include "../ccm_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/contrast.cpp b/src/ipa/raspberrypi/controller/rpi/contrast.cpp index 2bc43027..ae55aad5 100644 --- a/src/ipa/raspberrypi/controller/rpi/contrast.cpp +++ b/src/ipa/raspberrypi/controller/rpi/contrast.cpp @@ -6,7 +6,7 @@ */ #include <stdint.h> -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> #include "../contrast_status.h" #include "../histogram.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/dpc.cpp b/src/ipa/raspberrypi/controller/rpi/dpc.cpp index e533cd53..110f5056 100644 --- a/src/ipa/raspberrypi/controller/rpi/dpc.cpp +++ b/src/ipa/raspberrypi/controller/rpi/dpc.cpp @@ -5,7 +5,7 @@ * dpc.cpp - DPC (defective pixel correction) control algorithm */ -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> #include "dpc.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/focus.cpp b/src/ipa/raspberrypi/controller/rpi/focus.cpp index bab4406f..a87ec802 100644 --- a/src/ipa/raspberrypi/controller/rpi/focus.cpp +++ b/src/ipa/raspberrypi/controller/rpi/focus.cpp @@ -6,7 +6,7 @@ */ #include <stdint.h> -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> #include "../focus_status.h" #include "focus.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/geq.cpp b/src/ipa/raspberrypi/controller/rpi/geq.cpp index 5eff116c..bdceb1f3 100644 --- a/src/ipa/raspberrypi/controller/rpi/geq.cpp +++ b/src/ipa/raspberrypi/controller/rpi/geq.cpp @@ -5,7 +5,7 @@ * geq.cpp - GEQ (green equalisation) control algorithm */ -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> #include "../device_status.h" #include "../lux_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/lux.cpp b/src/ipa/raspberrypi/controller/rpi/lux.cpp index 258e44f4..f58d6939 100644 --- a/src/ipa/raspberrypi/controller/rpi/lux.cpp +++ b/src/ipa/raspberrypi/controller/rpi/lux.cpp @@ -8,7 +8,7 @@ #include "linux/bcm2835-isp.h" -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> #include "../device_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/noise.cpp b/src/ipa/raspberrypi/controller/rpi/noise.cpp index 156f7501..63cad639 100644 --- a/src/ipa/raspberrypi/controller/rpi/noise.cpp +++ b/src/ipa/raspberrypi/controller/rpi/noise.cpp @@ -7,7 +7,7 @@ #include <math.h> -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> #include "../device_status.h" #include "../noise_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/sdn.cpp b/src/ipa/raspberrypi/controller/rpi/sdn.cpp index 959bc740..93845509 100644 --- a/src/ipa/raspberrypi/controller/rpi/sdn.cpp +++ b/src/ipa/raspberrypi/controller/rpi/sdn.cpp @@ -5,7 +5,7 @@ * sdn.cpp - SDN (spatial denoise) control algorithm */ -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> #include "../denoise_status.h" #include "../noise_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp index 2cd861ca..b0c2e00a 100644 --- a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp +++ b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp @@ -7,7 +7,7 @@ #include <math.h> -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> #include "../sharpen_status.h" diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 1c1e802a..a3f01449 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -13,6 +13,10 @@ #include <string.h> #include <sys/mman.h> +#include <linux/bcm2835-isp.h> + +#include <libcamera/base/log.h> + #include <libcamera/buffer.h> #include <libcamera/control_ids.h> #include <libcamera/controls.h> @@ -25,9 +29,6 @@ #include <libcamera/span.h> #include "libcamera/internal/buffer.h" -#include "libcamera/internal/log.h" - -#include <linux/bcm2835-isp.h> #include "agc_algorithm.hpp" #include "agc_status.h" diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index b47ea324..cdfb4d13 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -15,6 +15,8 @@ #include <linux/rkisp1-config.h> #include <linux/v4l2-controls.h> +#include <libcamera/base/log.h> + #include <libcamera/buffer.h> #include <libcamera/control_ids.h> #include <libcamera/ipa/ipa_interface.h> @@ -22,8 +24,6 @@ #include <libcamera/ipa/rkisp1_ipa_interface.h> #include <libcamera/request.h> -#include "libcamera/internal/log.h" - namespace libcamera { LOG_DEFINE_CATEGORY(IPARkISP1) diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp index 13681d88..e44765af 100644 --- a/src/ipa/vimc/vimc.cpp +++ b/src/ipa/vimc/vimc.cpp @@ -14,11 +14,12 @@ #include <iostream> +#include <libcamera/base/log.h> + #include <libcamera/ipa/ipa_interface.h> #include <libcamera/ipa/ipa_module_info.h> #include "libcamera/internal/file.h" -#include "libcamera/internal/log.h" namespace libcamera { |