Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-24 17:15:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

5
include/libcamera/ipa/raspberrypi.h
View file

@ -10,6 +10,10 @@
#include <libcamera/control_ids.h> #include <libcamera/control_ids.h>
#include <libcamera/controls.h> #include <libcamera/controls.h>
enum RPiConfigParameters {
RPI_IPA_CONFIG_LS_TABLE = (1 << 0),
};
enum RPiOperations { enum RPiOperations {
RPI_IPA_ACTION_V4L2_SET_STAGGERED = 1, RPI_IPA_ACTION_V4L2_SET_STAGGERED = 1,
RPI_IPA_ACTION_V4L2_SET_ISP, RPI_IPA_ACTION_V4L2_SET_ISP,
@ -21,7 +25,6 @@ enum RPiOperations {
RPI_IPA_EVENT_SIGNAL_STAT_READY, RPI_IPA_EVENT_SIGNAL_STAT_READY,
RPI_IPA_EVENT_SIGNAL_ISP_PREPARE, RPI_IPA_EVENT_SIGNAL_ISP_PREPARE,
RPI_IPA_EVENT_QUEUE_REQUEST, RPI_IPA_EVENT_QUEUE_REQUEST,
RPI_IPA_EVENT_LS_TABLE_ALLOCATION,
}; };
enum RPiIpaMask { enum RPiIpaMask {

12
src/ipa/raspberrypi/raspberrypi.cpp
View file

@ -272,6 +272,12 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,
applyAGC(&agcStatus); applyAGC(&agcStatus);
lastMode_ = mode_; 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) void IPARPi::mapBuffers(const std::vector<IPABuffer> &buffers)
@ -354,12 +360,6 @@ void IPARPi::processEvent(const IPAOperationData &event)
break; break;
} }
case RPI_IPA_EVENT_LS_TABLE_ALLOCATION: {
lsTable_ = reinterpret_cast<void *>(event.data[0]);
lsTableHandle_ = event.data[1];
break;
}
default: default:
LOG(IPARPI, Error) << "Unknown event " << event.operation; LOG(IPARPI, Error) << "Unknown event " << event.operation;
break; break;

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, IPAStream> streamConfig;
std::map<unsigned int, const ControlInfoMap &> entityControls; std::map<unsigned int, const ControlInfoMap &> entityControls;
IPAOperationData ipaConfig = {};
/* Get the device format to pass to the IPA. */ /* Get the device format to pass to the IPA. */
V4L2DeviceFormat sensorFormat; V4L2DeviceFormat sensorFormat;
@ -1155,11 +1156,9 @@ int RPiCameraData::configureIPA()
* IPA module isolation and should be reworked when vc_sma_cma * IPA module isolation and should be reworked when vc_sma_cma
* will permit. * will permit.
*/ */
IPAOperationData op; ipaConfig.operation = RPI_IPA_CONFIG_LS_TABLE;
op.operation = RPI_IPA_EVENT_LS_TABLE_ALLOCATION; ipaConfig.data = { static_cast<uint32_t>(ptr & 0xffffffff),
op.data = { static_cast<uint32_t>(ptr & 0xffffffff), vcsm_.getVCHandle(lsTable_) };
vcsm_.getVCHandle(lsTable_) };
ipa_->processEvent(op);
} }
CameraSensorInfo sensorInfo = {}; CameraSensorInfo sensorInfo = {};
@ -1170,7 +1169,6 @@ int RPiCameraData::configureIPA()
} }
/* Ready the IPA - it must know about the sensor resolution. */ /* Ready the IPA - it must know about the sensor resolution. */
IPAOperationData ipaConfig;
ipa_->configure(sensorInfo, streamConfig, entityControls, ipaConfig, ipa_->configure(sensorInfo, streamConfig, entityControls, ipaConfig,
nullptr); nullptr);