NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

pipeline: ipa: raspberrypi: Tidy-ups after IPAInterface changes

Browse source 
This commit addresses a couple of tidy-ups after the IPAInterface
rework:
- Rename ConfigStaggeredWrite -> ConfigSensorParams
- Rename setIsp -> setIspControls

There is no functional change in this commit.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Naushir Patuck 2021-02-18 12:48:22 +00:00 • committed by Kieran Bingham
parent a13d229086
commit 22a33aa48f
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/libcamera/ipa/raspberrypi.mojom
View file

@ -16,7 +16,7 @@ enum BufferMask {
const uint32 MaxLsGridSize = 0x8000; const uint32 MaxLsGridSize = 0x8000;
enum ConfigOutputParameters { enum ConfigOutputParameters {
ConfigStaggeredWrite = 0x01, ConfigSensorParams = 0x01,
}; };
struct SensorConfig { struct SensorConfig {
@ -27,8 +27,8 @@ struct SensorConfig {
}; };
struct ISPConfig { struct ISPConfig {
uint32 embeddedbufferId; uint32 embeddedBufferId;
uint32 bayerbufferId; uint32 bayerBufferId;
}; };
struct ConfigInput { struct ConfigInput {
@ -126,6 +126,6 @@ interface IPARPiEventInterface {
statsMetadataComplete(uint32 bufferId, ControlList controls); statsMetadataComplete(uint32 bufferId, ControlList controls);
runIsp(uint32 bufferId); runIsp(uint32 bufferId);
embeddedComplete(uint32 bufferId); embeddedComplete(uint32 bufferId);
setIsp(ControlList controls); setIspControls(ControlList controls);
setDelayedControls(ControlList controls); setDelayedControls(ControlList controls);
}; };

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

@ -344,7 +344,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,
helper_->GetDelays(exposureDelay, gainDelay); helper_->GetDelays(exposureDelay, gainDelay);
sensorMetadata = helper_->SensorEmbeddedDataPresent(); sensorMetadata = helper_->SensorEmbeddedDataPresent();
result->params |= ipa::rpi::ConfigStaggeredWrite; result->params |= ipa::rpi::ConfigSensorParams;
result->sensorConfig.gainDelay = gainDelay; result->sensorConfig.gainDelay = gainDelay;
result->sensorConfig.exposureDelay = exposureDelay; result->sensorConfig.exposureDelay = exposureDelay;
result->sensorConfig.vblank = exposureDelay; result->sensorConfig.vblank = exposureDelay;
@ -447,11 +447,11 @@ void IPARPi::signalIspPrepare(const ipa::rpi::ISPConfig &data)
* avoid running the control algos for a few frames in case * avoid running the control algos for a few frames in case
* they are "unreliable". * they are "unreliable".
*/ */
prepareISP(data.embeddedbufferId); prepareISP(data.embeddedBufferId);
frameCount_++; frameCount_++;
/* Ready to push the input buffer into the ISP. */ /* Ready to push the input buffer into the ISP. */
runIsp.emit(data.bayerbufferId & ipa::rpi::MaskID); runIsp.emit(data.bayerBufferId & ipa::rpi::MaskID);
} }
void IPARPi::reportMetadata() void IPARPi::reportMetadata()
@ -972,7 +972,7 @@ void IPARPi::prepareISP(unsigned int bufferId)
applyDPC(dpcStatus, ctrls); applyDPC(dpcStatus, ctrls);
if (!ctrls.empty()) if (!ctrls.empty())
setIsp.emit(ctrls); setIspControls.emit(ctrls);
} }
} }

12
src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
View file

@ -152,7 +152,7 @@ public:
void statsMetadataComplete(uint32_t bufferId, const ControlList &controls); void statsMetadataComplete(uint32_t bufferId, const ControlList &controls);
void runIsp(uint32_t bufferId); void runIsp(uint32_t bufferId);
void embeddedComplete(uint32_t bufferId); void embeddedComplete(uint32_t bufferId);
void setIsp(const ControlList &controls); void setIspControls(const ControlList &controls);
void setDelayedControls(const ControlList &controls); void setDelayedControls(const ControlList &controls);
/* bufferComplete signal handlers. */ /* bufferComplete signal handlers. */
@ -1172,7 +1172,7 @@ int RPiCameraData::loadIPA()
ipa_->statsMetadataComplete.connect(this, &RPiCameraData::statsMetadataComplete); ipa_->statsMetadataComplete.connect(this, &RPiCameraData::statsMetadataComplete);
ipa_->runIsp.connect(this, &RPiCameraData::runIsp); ipa_->runIsp.connect(this, &RPiCameraData::runIsp);
ipa_->embeddedComplete.connect(this, &RPiCameraData::embeddedComplete); ipa_->embeddedComplete.connect(this, &RPiCameraData::embeddedComplete);
ipa_->setIsp.connect(this, &RPiCameraData::setIsp); ipa_->setIspControls.connect(this, &RPiCameraData::setIspControls);
ipa_->setDelayedControls.connect(this, &RPiCameraData::setDelayedControls); ipa_->setDelayedControls.connect(this, &RPiCameraData::setDelayedControls);
IPASettings settings(ipa_->configurationFile(sensor_->model() + ".json")); IPASettings settings(ipa_->configurationFile(sensor_->model() + ".json"));
@ -1241,7 +1241,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)
return -EPIPE; return -EPIPE;
} }
if (result.params & ipa::rpi::ConfigStaggeredWrite) { if (result.params & ipa::rpi::ConfigSensorParams) {
/* /*
* Setup our delayed control writer with the sensor default * Setup our delayed control writer with the sensor default
* gain and exposure delays. * gain and exposure delays.
@ -1336,7 +1336,7 @@ void RPiCameraData::embeddedComplete(uint32_t bufferId)
handleState(); handleState();
} }
void RPiCameraData::setIsp(const ControlList &controls) void RPiCameraData::setIspControls(const ControlList &controls)
{ {
ControlList ctrls = controls; ControlList ctrls = controls;
@ -1692,8 +1692,8 @@ void RPiCameraData::tryRunPipeline()
<< " Embedded buffer id: " << embeddedId; << " Embedded buffer id: " << embeddedId;
ipa::rpi::ISPConfig ispPrepare; ipa::rpi::ISPConfig ispPrepare;
ispPrepare.embeddedbufferId = ipa::rpi::MaskEmbeddedData | embeddedId; ispPrepare.embeddedBufferId = ipa::rpi::MaskEmbeddedData | embeddedId;
ispPrepare.bayerbufferId = ipa::rpi::MaskBayerData | bayerId; ispPrepare.bayerBufferId = ipa::rpi::MaskBayerData | bayerId;
ipa_->signalIspPrepare(ispPrepare); ipa_->signalIspPrepare(ispPrepare);
} }