summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2021-02-18 12:48:22 +0000
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-02-19 11:36:47 +0000
commit22a33aa48feb31f654c1d06f14ea9a9d418f02a5 (patch)
tree4898d7718e081a847e31e7f227b531c5c025751f
parenta13d229086d73bcde4c0204d359e2352de4fdbdf (diff)
pipeline: ipa: raspberrypi: Tidy-ups after IPAInterface changes
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>
-rw-r--r--include/libcamera/ipa/raspberrypi.mojom8
-rw-r--r--src/ipa/raspberrypi/raspberrypi.cpp8
-rw-r--r--src/libcamera/pipeline/raspberrypi/raspberrypi.cpp12
3 files changed, 14 insertions, 14 deletions
diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom
index bab19a94..9c05cc68 100644
--- a/include/libcamera/ipa/raspberrypi.mojom
+++ b/include/libcamera/ipa/raspberrypi.mojom
@@ -16,7 +16,7 @@ enum BufferMask {
const uint32 MaxLsGridSize = 0x8000;
enum ConfigOutputParameters {
- ConfigStaggeredWrite = 0x01,
+ ConfigSensorParams = 0x01,
};
struct SensorConfig {
@@ -27,8 +27,8 @@ struct SensorConfig {
};
struct ISPConfig {
- uint32 embeddedbufferId;
- uint32 bayerbufferId;
+ uint32 embeddedBufferId;
+ uint32 bayerBufferId;
};
struct ConfigInput {
@@ -126,6 +126,6 @@ interface IPARPiEventInterface {
statsMetadataComplete(uint32 bufferId, ControlList controls);
runIsp(uint32 bufferId);
embeddedComplete(uint32 bufferId);
- setIsp(ControlList controls);
+ setIspControls(ControlList controls);
setDelayedControls(ControlList controls);
};
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index 4608dfd4..0ad34667 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -344,7 +344,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,
helper_->GetDelays(exposureDelay, gainDelay);
sensorMetadata = helper_->SensorEmbeddedDataPresent();
- result->params |= ipa::rpi::ConfigStaggeredWrite;
+ result->params |= ipa::rpi::ConfigSensorParams;
result->sensorConfig.gainDelay = gainDelay;
result->sensorConfig.exposureDelay = 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
* they are "unreliable".
*/
- prepareISP(data.embeddedbufferId);
+ prepareISP(data.embeddedBufferId);
frameCount_++;
/* 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()
@@ -972,7 +972,7 @@ void IPARPi::prepareISP(unsigned int bufferId)
applyDPC(dpcStatus, ctrls);
if (!ctrls.empty())
- setIsp.emit(ctrls);
+ setIspControls.emit(ctrls);
}
}
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index 75d57c2a..aac285b4 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -152,7 +152,7 @@ public:
void statsMetadataComplete(uint32_t bufferId, const ControlList &controls);
void runIsp(uint32_t bufferId);
void embeddedComplete(uint32_t bufferId);
- void setIsp(const ControlList &controls);
+ void setIspControls(const ControlList &controls);
void setDelayedControls(const ControlList &controls);
/* bufferComplete signal handlers. */
@@ -1172,7 +1172,7 @@ int RPiCameraData::loadIPA()
ipa_->statsMetadataComplete.connect(this, &RPiCameraData::statsMetadataComplete);
ipa_->runIsp.connect(this, &RPiCameraData::runIsp);
ipa_->embeddedComplete.connect(this, &RPiCameraData::embeddedComplete);
- ipa_->setIsp.connect(this, &RPiCameraData::setIsp);
+ ipa_->setIspControls.connect(this, &RPiCameraData::setIspControls);
ipa_->setDelayedControls.connect(this, &RPiCameraData::setDelayedControls);
IPASettings settings(ipa_->configurationFile(sensor_->model() + ".json"));
@@ -1241,7 +1241,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)
return -EPIPE;
}
- if (result.params & ipa::rpi::ConfigStaggeredWrite) {
+ if (result.params & ipa::rpi::ConfigSensorParams) {
/*
* Setup our delayed control writer with the sensor default
* gain and exposure delays.
@@ -1336,7 +1336,7 @@ void RPiCameraData::embeddedComplete(uint32_t bufferId)
handleState();
}
-void RPiCameraData::setIsp(const ControlList &controls)
+void RPiCameraData::setIspControls(const ControlList &controls)
{
ControlList ctrls = controls;
@@ -1692,8 +1692,8 @@ void RPiCameraData::tryRunPipeline()
<< " Embedded buffer id: " << embeddedId;
ipa::rpi::ISPConfig ispPrepare;
- ispPrepare.embeddedbufferId = ipa::rpi::MaskEmbeddedData | embeddedId;
- ispPrepare.bayerbufferId = ipa::rpi::MaskBayerData | bayerId;
+ ispPrepare.embeddedBufferId = ipa::rpi::MaskEmbeddedData | embeddedId;
+ ispPrepare.bayerBufferId = ipa::rpi::MaskBayerData | bayerId;
ipa_->signalIspPrepare(ispPrepare);
}