summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-06-29 00:42:20 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-07-17 02:13:41 +0300
commit40ed8b3b75aa518226bbe35f6216797d4832341e (patch)
tree5b9f8a10654cc51665583c305255d261c971bb4c /src
parentc0b0b7205c7e59ad754b5cf2c79d661e5676eb73 (diff)
ipa: raspberrypi: Pass lens shading table through configure() function
The IPAInterface::configure() function now accepts custom configuration data. Use it to pass the lens shading table instead of using a custom IPA event. This will allow starting the IPA when starting the camera, instead of pre-starting it early in order to process the lens shading table allocation event. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
Diffstat (limited to 'src')
-rw-r--r--src/ipa/raspberrypi/raspberrypi.cpp12
-rw-r--r--src/libcamera/pipeline/raspberrypi/raspberrypi.cpp10
2 files changed, 10 insertions, 12 deletions
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index 851597f0..b412260b 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -272,6 +272,12 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,
applyAGC(&agcStatus);
lastMode_ = mode_;
+
+ /* Store the lens shading table pointer and handle if available. */
+ if (ipaConfig.operation & RPI_IPA_CONFIG_LS_TABLE) {
+ lsTable_ = reinterpret_cast<void *>(ipaConfig.data[0]);
+ lsTableHandle_ = ipaConfig.data[1];
+ }
}
void IPARPi::mapBuffers(const std::vector<IPABuffer> &buffers)
@@ -354,12 +360,6 @@ void IPARPi::processEvent(const IPAOperationData &event)
break;
}
- case RPI_IPA_EVENT_LS_TABLE_ALLOCATION: {
- lsTable_ = reinterpret_cast<void *>(event.data[0]);
- lsTableHandle_ = event.data[1];
- break;
- }
-
default:
LOG(IPARPI, Error) << "Unknown event " << event.operation;
break;
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index 12241590..dfcc7506 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -1121,6 +1121,7 @@ int RPiCameraData::configureIPA()
{
std::map<unsigned int, IPAStream> streamConfig;
std::map<unsigned int, const ControlInfoMap &> entityControls;
+ IPAOperationData ipaConfig = {};
/* Get the device format to pass to the IPA. */
V4L2DeviceFormat sensorFormat;
@@ -1155,11 +1156,9 @@ int RPiCameraData::configureIPA()
* IPA module isolation and should be reworked when vc_sma_cma
* will permit.
*/
- IPAOperationData op;
- op.operation = RPI_IPA_EVENT_LS_TABLE_ALLOCATION;
- op.data = { static_cast<uint32_t>(ptr & 0xffffffff),
- vcsm_.getVCHandle(lsTable_) };
- ipa_->processEvent(op);
+ ipaConfig.operation = RPI_IPA_CONFIG_LS_TABLE;
+ ipaConfig.data = { static_cast<uint32_t>(ptr & 0xffffffff),
+ vcsm_.getVCHandle(lsTable_) };
}
CameraSensorInfo sensorInfo = {};
@@ -1170,7 +1169,6 @@ int RPiCameraData::configureIPA()
}
/* Ready the IPA - it must know about the sensor resolution. */
- IPAOperationData ipaConfig;
ipa_->configure(sensorInfo, streamConfig, entityControls, ipaConfig,
nullptr);