@@ -13,8 +13,8 @@
#include "libcamera/internal/v4l2_videodevice.h"
-#include "cam_helper.hpp"
-#include "md_parser.hpp"
+#include "cam_helper.h"
+#include "md_parser.h"
using namespace RPiController;
using namespace libcamera;
similarity index 96%
rename from src/ipa/raspberrypi/cam_helper.hpp
rename to src/ipa/raspberrypi/cam_helper.h
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * cam_helper.hpp - helper class providing camera information
+ * cam_helper.h - helper class providing camera information
*/
#pragma once
@@ -13,9 +13,9 @@
#include <libcamera/base/utils.h>
#include "camera_mode.h"
-#include "controller/controller.hpp"
-#include "controller/metadata.hpp"
-#include "md_parser.hpp"
+#include "controller/controller.h"
+#include "controller/metadata.h"
+#include "md_parser.h"
#include "libcamera/internal/v4l2_videodevice.h"
@@ -16,9 +16,9 @@
*/
#define ENABLE_EMBEDDED_DATA 0
-#include "cam_helper.hpp"
+#include "cam_helper.h"
#if ENABLE_EMBEDDED_DATA
-#include "md_parser.hpp"
+#include "md_parser.h"
#endif
using namespace RPiController;
@@ -7,7 +7,7 @@
#include <math.h>
-#include "cam_helper.hpp"
+#include "cam_helper.h"
using namespace RPiController;
@@ -9,7 +9,7 @@
#include <cmath>
#include <stddef.h>
-#include "cam_helper.hpp"
+#include "cam_helper.h"
using namespace RPiController;
using libcamera::utils::Duration;
@@ -14,8 +14,8 @@
#include <libcamera/base/log.h>
-#include "cam_helper.hpp"
-#include "md_parser.hpp"
+#include "cam_helper.h"
+#include "md_parser.h"
using namespace RPiController;
using namespace libcamera;
@@ -15,8 +15,8 @@
#include <libcamera/base/log.h>
-#include "cam_helper.hpp"
-#include "md_parser.hpp"
+#include "cam_helper.h"
+#include "md_parser.h"
using namespace RPiController;
using namespace libcamera;
@@ -7,7 +7,7 @@
#include <assert.h>
-#include "cam_helper.hpp"
+#include "cam_helper.h"
using namespace RPiController;
@@ -7,7 +7,7 @@
#include <assert.h>
-#include "cam_helper.hpp"
+#include "cam_helper.h"
using namespace RPiController;
similarity index 92%
rename from src/ipa/raspberrypi/controller/agc_algorithm.hpp
rename to src/ipa/raspberrypi/controller/agc_algorithm.h
@@ -2,13 +2,13 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * agc_algorithm.hpp - AGC/AEC control algorithm interface
+ * agc_algorithm.h - AGC/AEC control algorithm interface
*/
#pragma once
#include <libcamera/base/utils.h>
-#include "algorithm.hpp"
+#include "algorithm.h"
namespace RPiController {
@@ -5,7 +5,7 @@
* algorithm.cpp - ISP control algorithms
*/
-#include "algorithm.hpp"
+#include "algorithm.h"
using namespace RPiController;
similarity index 95%
rename from src/ipa/raspberrypi/controller/algorithm.hpp
rename to src/ipa/raspberrypi/controller/algorithm.h
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * algorithm.hpp - ISP control algorithm interface
+ * algorithm.h - ISP control algorithm interface
*/
#pragma once
@@ -15,7 +15,7 @@
#include <memory>
#include <map>
-#include "controller.hpp"
+#include "controller.h"
#include <boost/property_tree/ptree.hpp>
similarity index 86%
rename from src/ipa/raspberrypi/controller/awb_algorithm.hpp
rename to src/ipa/raspberrypi/controller/awb_algorithm.h
@@ -2,11 +2,11 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * awb_algorithm.hpp - AWB control algorithm interface
+ * awb_algorithm.h - AWB control algorithm interface
*/
#pragma once
-#include "algorithm.hpp"
+#include "algorithm.h"
namespace RPiController {
similarity index 78%
rename from src/ipa/raspberrypi/controller/ccm_algorithm.hpp
rename to src/ipa/raspberrypi/controller/ccm_algorithm.h
@@ -2,11 +2,11 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * ccm_algorithm.hpp - CCM (colour correction matrix) control algorithm interface
+ * ccm_algorithm.h - CCM (colour correction matrix) control algorithm interface
*/
#pragma once
-#include "algorithm.hpp"
+#include "algorithm.h"
namespace RPiController {
similarity index 82%
rename from src/ipa/raspberrypi/controller/contrast_algorithm.hpp
rename to src/ipa/raspberrypi/controller/contrast_algorithm.h
@@ -2,11 +2,11 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * contrast_algorithm.hpp - contrast (gamma) control algorithm interface
+ * contrast_algorithm.h - contrast (gamma) control algorithm interface
*/
#pragma once
-#include "algorithm.hpp"
+#include "algorithm.h"
namespace RPiController {
@@ -7,8 +7,8 @@
#include <libcamera/base/log.h>
-#include "algorithm.hpp"
-#include "controller.hpp"
+#include "algorithm.h"
+#include "controller.h"
#include <boost/property_tree/json_parser.hpp>
#include <boost/property_tree/ptree.hpp>
similarity index 95%
rename from src/ipa/raspberrypi/controller/controller.hpp
rename to src/ipa/raspberrypi/controller/controller.h
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * controller.hpp - ISP controller interface
+ * controller.h - ISP controller interface
*/
#pragma once
@@ -19,7 +19,7 @@
#include "camera_mode.h"
#include "device_status.h"
-#include "metadata.hpp"
+#include "metadata.h"
namespace RPiController {
similarity index 86%
rename from src/ipa/raspberrypi/controller/denoise_algorithm.hpp
rename to src/ipa/raspberrypi/controller/denoise_algorithm.h
@@ -2,11 +2,11 @@
/*
* Copyright (C) 2021, Raspberry Pi (Trading) Limited
*
- * denoise.hpp - Denoise control algorithm interface
+ * denoise.h - Denoise control algorithm interface
*/
#pragma once
-#include "algorithm.hpp"
+#include "algorithm.h"
namespace RPiController {
@@ -7,7 +7,7 @@
#include <math.h>
#include <stdio.h>
-#include "histogram.hpp"
+#include "histogram.h"
using namespace RPiController;
similarity index 96%
rename from src/ipa/raspberrypi/controller/histogram.hpp
rename to src/ipa/raspberrypi/controller/histogram.h
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * histogram.hpp - histogram calculation interface
+ * histogram.h - histogram calculation interface
*/
#pragma once
similarity index 98%
rename from src/ipa/raspberrypi/controller/metadata.hpp
rename to src/ipa/raspberrypi/controller/metadata.h
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2019-2021, Raspberry Pi (Trading) Limited
*
- * metadata.hpp - general metadata class
+ * metadata.h - general metadata class
*/
#pragma once
@@ -8,7 +8,7 @@
#include <cassert>
#include <stdexcept>
-#include "pwl.hpp"
+#include "pwl.h"
using namespace RPiController;
similarity index 98%
rename from src/ipa/raspberrypi/controller/pwl.hpp
rename to src/ipa/raspberrypi/controller/pwl.h
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * pwl.hpp - piecewise linear functions interface
+ * pwl.h - piecewise linear functions interface
*/
#pragma once
@@ -13,11 +13,11 @@
#include "../awb_status.h"
#include "../device_status.h"
-#include "../histogram.hpp"
+#include "../histogram.h"
#include "../lux_status.h"
-#include "../metadata.hpp"
+#include "../metadata.h"
-#include "agc.hpp"
+#include "agc.h"
using namespace RPiController;
using namespace libcamera;
similarity index 97%
rename from src/ipa/raspberrypi/controller/rpi/agc.hpp
rename to src/ipa/raspberrypi/controller/rpi/agc.h
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * agc.hpp - AGC/AEC control algorithm
+ * agc.h - AGC/AEC control algorithm
*/
#pragma once
@@ -11,9 +11,9 @@
#include <libcamera/base/utils.h>
-#include "../agc_algorithm.hpp"
+#include "../agc_algorithm.h"
#include "../agc_status.h"
-#include "../pwl.hpp"
+#include "../pwl.h"
/* This is our implementation of AGC. */
@@ -12,7 +12,7 @@
#include <libcamera/base/span.h>
#include "../awb_status.h"
-#include "alsc.hpp"
+#include "alsc.h"
/* Raspberry Pi ALSC (Auto Lens Shading Correction) algorithm. */
similarity index 97%
rename from src/ipa/raspberrypi/controller/rpi/alsc.hpp
rename to src/ipa/raspberrypi/controller/rpi/alsc.h
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * alsc.hpp - ALSC (auto lens shading correction) control algorithm
+ * alsc.h - ALSC (auto lens shading correction) control algorithm
*/
#pragma once
@@ -10,7 +10,7 @@
#include <condition_variable>
#include <thread>
-#include "../algorithm.hpp"
+#include "../algorithm.h"
#include "../alsc_status.h"
namespace RPiController {
@@ -9,7 +9,7 @@
#include "../lux_status.h"
-#include "awb.hpp"
+#include "awb.h"
using namespace RPiController;
using namespace libcamera;
similarity index 98%
rename from src/ipa/raspberrypi/controller/rpi/awb.hpp
rename to src/ipa/raspberrypi/controller/rpi/awb.h
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * awb.hpp - AWB control algorithm
+ * awb.h - AWB control algorithm
*/
#pragma once
@@ -10,8 +10,8 @@
#include <condition_variable>
#include <thread>
-#include "../awb_algorithm.hpp"
-#include "../pwl.hpp"
+#include "../awb_algorithm.h"
+#include "../pwl.h"
#include "../awb_status.h"
namespace RPiController {
@@ -12,7 +12,7 @@
#include "../black_level_status.h"
-#include "black_level.hpp"
+#include "black_level.h"
using namespace RPiController;
using namespace libcamera;
similarity index 88%
rename from src/ipa/raspberrypi/controller/rpi/black_level.hpp
rename to src/ipa/raspberrypi/controller/rpi/black_level.h
@@ -2,11 +2,11 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * black_level.hpp - black level control algorithm
+ * black_level.h - black level control algorithm
*/
#pragma once
-#include "../algorithm.hpp"
+#include "../algorithm.h"
#include "../black_level_status.h"
/* This is our implementation of the "black level algorithm". */
@@ -10,9 +10,9 @@
#include "../awb_status.h"
#include "../ccm_status.h"
#include "../lux_status.h"
-#include "../metadata.hpp"
+#include "../metadata.h"
-#include "ccm.hpp"
+#include "ccm.h"
using namespace RPiController;
using namespace libcamera;
similarity index 93%
rename from src/ipa/raspberrypi/controller/rpi/ccm.hpp
rename to src/ipa/raspberrypi/controller/rpi/ccm.h
@@ -2,14 +2,14 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * ccm.hpp - CCM (colour correction matrix) control algorithm
+ * ccm.h - CCM (colour correction matrix) control algorithm
*/
#pragma once
#include <vector>
-#include "../ccm_algorithm.hpp"
-#include "../pwl.hpp"
+#include "../ccm_algorithm.h"
+#include "../pwl.h"
namespace RPiController {
@@ -9,9 +9,9 @@
#include <libcamera/base/log.h>
#include "../contrast_status.h"
-#include "../histogram.hpp"
+#include "../histogram.h"
-#include "contrast.hpp"
+#include "contrast.h"
using namespace RPiController;
using namespace libcamera;
similarity index 90%
rename from src/ipa/raspberrypi/controller/rpi/contrast.hpp
rename to src/ipa/raspberrypi/controller/rpi/contrast.h
@@ -2,14 +2,14 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * contrast.hpp - contrast (gamma) control algorithm
+ * contrast.h - contrast (gamma) control algorithm
*/
#pragma once
#include <mutex>
-#include "../contrast_algorithm.hpp"
-#include "../pwl.hpp"
+#include "../contrast_algorithm.h"
+#include "../pwl.h"
namespace RPiController {
@@ -7,7 +7,7 @@
#include <libcamera/base/log.h>
-#include "dpc.hpp"
+#include "dpc.h"
using namespace RPiController;
using namespace libcamera;
similarity index 85%
rename from src/ipa/raspberrypi/controller/rpi/dpc.hpp
rename to src/ipa/raspberrypi/controller/rpi/dpc.h
@@ -2,11 +2,11 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * dpc.hpp - DPC (defective pixel correction) control algorithm
+ * dpc.h - DPC (defective pixel correction) control algorithm
*/
#pragma once
-#include "../algorithm.hpp"
+#include "../algorithm.h"
#include "../dpc_status.h"
namespace RPiController {
@@ -9,7 +9,7 @@
#include <libcamera/base/log.h>
#include "../focus_status.h"
-#include "focus.hpp"
+#include "focus.h"
using namespace RPiController;
using namespace libcamera;
similarity index 85%
rename from src/ipa/raspberrypi/controller/rpi/focus.hpp
rename to src/ipa/raspberrypi/controller/rpi/focus.h
@@ -2,12 +2,12 @@
/*
* Copyright (C) 2020, Raspberry Pi (Trading) Limited
*
- * focus.hpp - focus algorithm
+ * focus.h - focus algorithm
*/
#pragma once
-#include "../algorithm.hpp"
-#include "../metadata.hpp"
+#include "../algorithm.h"
+#include "../metadata.h"
/*
* The "focus" algorithm. All it does it print out a version of the
@@ -9,9 +9,9 @@
#include "../device_status.h"
#include "../lux_status.h"
-#include "../pwl.hpp"
+#include "../pwl.h"
-#include "geq.hpp"
+#include "geq.h"
using namespace RPiController;
using namespace libcamera;
similarity index 88%
rename from src/ipa/raspberrypi/controller/rpi/geq.hpp
rename to src/ipa/raspberrypi/controller/rpi/geq.h
@@ -2,11 +2,11 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * geq.hpp - GEQ (green equalisation) control algorithm
+ * geq.h - GEQ (green equalisation) control algorithm
*/
#pragma once
-#include "../algorithm.hpp"
+#include "../algorithm.h"
#include "../geq_status.h"
namespace RPiController {
@@ -12,7 +12,7 @@
#include "../device_status.h"
-#include "lux.hpp"
+#include "lux.h"
using namespace RPiController;
using namespace libcamera;
similarity index 94%
rename from src/ipa/raspberrypi/controller/rpi/lux.hpp
rename to src/ipa/raspberrypi/controller/rpi/lux.h
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * lux.hpp - Lux control algorithm
+ * lux.h - Lux control algorithm
*/
#pragma once
@@ -11,7 +11,7 @@
#include <libcamera/base/utils.h>
#include "../lux_status.h"
-#include "../algorithm.hpp"
+#include "../algorithm.h"
/* This is our implementation of the "lux control algorithm". */
@@ -12,7 +12,7 @@
#include "../device_status.h"
#include "../noise_status.h"
-#include "noise.hpp"
+#include "noise.h"
using namespace RPiController;
using namespace libcamera;
similarity index 91%
rename from src/ipa/raspberrypi/controller/rpi/noise.hpp
rename to src/ipa/raspberrypi/controller/rpi/noise.h
@@ -2,11 +2,11 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * noise.hpp - Noise control algorithm
+ * noise.h - Noise control algorithm
*/
#pragma once
-#include "../algorithm.hpp"
+#include "../algorithm.h"
#include "../noise_status.h"
/* This is our implementation of the "noise algorithm". */
@@ -10,7 +10,7 @@
#include "../denoise_status.h"
#include "../noise_status.h"
-#include "sdn.hpp"
+#include "sdn.h"
using namespace RPiController;
using namespace libcamera;
similarity index 84%
rename from src/ipa/raspberrypi/controller/rpi/sdn.hpp
rename to src/ipa/raspberrypi/controller/rpi/sdn.h
@@ -2,12 +2,12 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * sdn.hpp - SDN (spatial denoise) control algorithm
+ * sdn.h - SDN (spatial denoise) control algorithm
*/
#pragma once
-#include "../algorithm.hpp"
-#include "../denoise_algorithm.hpp"
+#include "../algorithm.h"
+#include "../denoise_algorithm.h"
namespace RPiController {
@@ -11,7 +11,7 @@
#include "../sharpen_status.h"
-#include "sharpen.hpp"
+#include "sharpen.h"
using namespace RPiController;
using namespace libcamera;
similarity index 90%
rename from src/ipa/raspberrypi/controller/rpi/sharpen.hpp
rename to src/ipa/raspberrypi/controller/rpi/sharpen.h
@@ -2,11 +2,11 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * sharpen.hpp - sharpening control algorithm
+ * sharpen.h - sharpening control algorithm
*/
#pragma once
-#include "../sharpen_algorithm.hpp"
+#include "../sharpen_algorithm.h"
#include "../sharpen_status.h"
/* This is our implementation of the "sharpen algorithm". */
similarity index 82%
rename from src/ipa/raspberrypi/controller/sharpen_algorithm.hpp
rename to src/ipa/raspberrypi/controller/sharpen_algorithm.h
@@ -2,11 +2,11 @@
/*
* Copyright (C) 2020, Raspberry Pi (Trading) Limited
*
- * sharpen_algorithm.hpp - sharpness control algorithm interface
+ * sharpen_algorithm.h - sharpness control algorithm interface
*/
#pragma once
-#include "algorithm.hpp"
+#include "algorithm.h"
namespace RPiController {
similarity index 98%
rename from src/ipa/raspberrypi/md_parser.hpp
rename to src/ipa/raspberrypi/md_parser.h
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
- * md_parser.hpp - image sensor metadata parser interface
+ * md_parser.h - image sensor metadata parser interface
*/
#pragma once
@@ -6,7 +6,7 @@
*/
#include <libcamera/base/log.h>
-#include "md_parser.hpp"
+#include "md_parser.h"
using namespace RPiController;
using namespace libcamera;
@@ -29,27 +29,27 @@
#include "libcamera/internal/mapped_framebuffer.h"
-#include "agc_algorithm.hpp"
+#include "agc_algorithm.h"
#include "agc_status.h"
#include "alsc_status.h"
-#include "awb_algorithm.hpp"
+#include "awb_algorithm.h"
#include "awb_status.h"
#include "black_level_status.h"
-#include "cam_helper.hpp"
-#include "ccm_algorithm.hpp"
+#include "cam_helper.h"
+#include "ccm_algorithm.h"
#include "ccm_status.h"
-#include "contrast_algorithm.hpp"
+#include "contrast_algorithm.h"
#include "contrast_status.h"
-#include "controller.hpp"
-#include "denoise_algorithm.hpp"
+#include "controller.h"
+#include "denoise_algorithm.h"
#include "denoise_status.h"
#include "dpc_status.h"
#include "focus_status.h"
#include "geq_status.h"
#include "lux_status.h"
-#include "metadata.hpp"
+#include "metadata.h"
#include "noise_status.h"
-#include "sharpen_algorithm.hpp"
+#include "sharpen_algorithm.h"
#include "sharpen_status.h"
namespace libcamera {