summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2020-09-24 10:19:26 +0100
committerKieran Bingham <kieran.bingham@ideasonboard.com>2020-09-29 12:41:31 +0100
commit0e2c71402400aa74bd5d1b2c786e52ae93fed835 (patch)
treed2e16d301bf99632db853e389cdace45012432fa /include
parent2f46dec94936e190098a6d0b5380137b025575b9 (diff)
ipa: raspberrypi: Move IPA parameters to the RPi namespace
All IPA related types/params are now moved to the RPi namespace. There are no functional changes in this commit. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> [Kieran: Rebase merge conflicts fixed] Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'include')
-rw-r--r--include/libcamera/ipa/raspberrypi.h40
1 files changed, 22 insertions, 18 deletions
diff --git a/include/libcamera/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h
index dd6ebeac..c9d4aa81 100644
--- a/include/libcamera/ipa/raspberrypi.h
+++ b/include/libcamera/ipa/raspberrypi.h
@@ -10,25 +10,29 @@
#include <libcamera/control_ids.h>
#include <libcamera/controls.h>
-enum RPiConfigParameters {
- RPI_IPA_CONFIG_LS_TABLE = (1 << 0),
- RPI_IPA_CONFIG_STAGGERED_WRITE = (1 << 1),
- RPI_IPA_CONFIG_SENSOR = (1 << 2),
- RPI_IPA_CONFIG_DROP_FRAMES = (1 << 3),
+namespace libcamera {
+
+namespace RPi {
+
+enum ConfigParameters {
+ IPA_CONFIG_LS_TABLE = (1 << 0),
+ IPA_CONFIG_STAGGERED_WRITE = (1 << 1),
+ IPA_CONFIG_SENSOR = (1 << 2),
+ IPA_CONFIG_DROP_FRAMES = (1 << 3),
};
-enum RPiOperations {
- RPI_IPA_ACTION_V4L2_SET_STAGGERED = 1,
- RPI_IPA_ACTION_V4L2_SET_ISP,
- RPI_IPA_ACTION_STATS_METADATA_COMPLETE,
- RPI_IPA_ACTION_RUN_ISP,
- RPI_IPA_ACTION_EMBEDDED_COMPLETE,
- RPI_IPA_EVENT_SIGNAL_STAT_READY,
- RPI_IPA_EVENT_SIGNAL_ISP_PREPARE,
- RPI_IPA_EVENT_QUEUE_REQUEST,
+enum Operations {
+ IPA_ACTION_V4L2_SET_STAGGERED = 1,
+ IPA_ACTION_V4L2_SET_ISP,
+ IPA_ACTION_STATS_METADATA_COMPLETE,
+ IPA_ACTION_RUN_ISP,
+ IPA_ACTION_EMBEDDED_COMPLETE,
+ IPA_EVENT_SIGNAL_STAT_READY,
+ IPA_EVENT_SIGNAL_ISP_PREPARE,
+ IPA_EVENT_QUEUE_REQUEST,
};
-enum RPiBufferMask {
+enum BufferMask {
ID = 0x00ffff,
STATS = 0x010000,
EMBEDDED_DATA = 0x020000,
@@ -39,10 +43,8 @@ enum RPiBufferMask {
/* Size of the LS grid allocation. */
#define MAX_LS_GRID_SIZE (32 << 10)
-namespace libcamera {
-
/* List of controls handled by the Raspberry Pi IPA */
-static const ControlInfoMap RPiControls = {
+static const ControlInfoMap Controls = {
{ &controls::AeEnable, ControlInfo(false, true) },
{ &controls::ExposureTime, ControlInfo(0, 999999) },
{ &controls::AnalogueGain, ControlInfo(1.0f, 32.0f) },
@@ -60,6 +62,8 @@ static const ControlInfoMap RPiControls = {
{ &controls::ColourCorrectionMatrix, ControlInfo(-16.0f, 16.0f) },
};
+} /* namespace RPi */
+
} /* namespace libcamera */
#endif /* __LIBCAMERA_IPA_INTERFACE_RASPBERRYPI_H__ */