summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2023-01-23 15:49:21 +0000
committerKieran Bingham <kieran.bingham@ideasonboard.com>2023-01-30 16:30:43 +0000
commita0701930a8be9900d428a8cbae0414b455b56e97 (patch)
tree0b36c0f8ced5390317ba261487acfae972213bfc /src
parent8f85c024f9224ccb75819812b888ee6c007ff834 (diff)
pipeline: ipa: raspberrypi: Check if lens actuator is available
Check if a lens actuator is available by the presense of the lens driver entity in the pipeline handler. Pass this result to the IPA on init. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: David Plowman <david.plowman@raspberrypi.com> Reviewed-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src')
-rw-r--r--src/ipa/raspberrypi/raspberrypi.cpp7
-rw-r--r--src/libcamera/pipeline/raspberrypi/raspberrypi.cpp3
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index bead436d..ec184971 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -115,7 +115,7 @@ public:
munmap(lsTable_, MaxLsGridSize);
}
- int init(const IPASettings &settings, IPAInitResult *result) override;
+ int init(const IPASettings &settings, bool lensPresent, IPAInitResult *result) override;
void start(const ControlList &controls, StartConfig *startConfig) override;
void stop() override {}
@@ -158,6 +158,7 @@ private:
ControlInfoMap sensorCtrls_;
ControlInfoMap ispCtrls_;
+ bool lensPresent_;
ControlList libcameraMetadata_;
/* Camera sensor params. */
@@ -204,7 +205,7 @@ private:
uint32_t maxSensorGainCode_;
};
-int IPARPi::init(const IPASettings &settings, IPAInitResult *result)
+int IPARPi::init(const IPASettings &settings, bool lensPresent, IPAInitResult *result)
{
/*
* Load the "helper" for this sensor. This tells us all the device specific stuff
@@ -241,6 +242,8 @@ int IPARPi::init(const IPASettings &settings, IPAInitResult *result)
return ret;
}
+ lensPresent_ = lensPresent;
+
controller_.initialise();
/* Return the controls handled by the IPA */
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index 9229d3cb..8892a1c3 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -32,6 +32,7 @@
#include "libcamera/internal/bayer_format.h"
#include "libcamera/internal/camera.h"
+#include "libcamera/internal/camera_lens.h"
#include "libcamera/internal/camera_sensor.h"
#include "libcamera/internal/device_enumerator.h"
#include "libcamera/internal/framebuffer.h"
@@ -1513,7 +1514,7 @@ int RPiCameraData::loadIPA(ipa::RPi::IPAInitResult *result)
IPASettings settings(configurationFile, sensor_->model());
- return ipa_->init(settings, result);
+ return ipa_->init(settings, !!sensor_->focusLens(), result);
}
int RPiCameraData::configureIPA(const CameraConfiguration *config, ipa::RPi::IPAConfigResult *result)