PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipa: raspberrypi: Pass lens shading table through configure() function

Browse Source 
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>
This commit is contained in:
Laurent Pinchart
2020-06-29 00:42:20 +03:00
parent c0b0b7205c
commit 40ed8b3b75
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
View File

@@ -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);