summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorUmang Jain <umang.jain@ideasonboard.com>2022-03-25 15:52:05 +0530
committerUmang Jain <umang.jain@ideasonboard.com>2022-03-28 17:01:17 +0530
commit60c3d32a89935b265eb657affa861cf30f95d348 (patch)
tree5d9745c39c87898a165e5bae22de183e66434ac4 /src
parent36f0cd57cb4091022bb18533277950fdbab0f09e (diff)
ipa: ipu3: Ensure controls exists in before they are queried
Add a validation check for sensor controls validateSensorControls() before they are queried in IPAIPU3::updateSessionConfiguration(). Fail the IPAIPU3::configure() if the required sensor controls are not found. Signed-off-by: Umang Jain <umang.jain@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src')
-rw-r--r--src/ipa/ipu3/ipu3.cpp28
1 files changed, 28 insertions, 0 deletions
diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp
index 3717d893..50b52d8b 100644
--- a/src/ipa/ipu3/ipu3.cpp
+++ b/src/ipa/ipu3/ipu3.cpp
@@ -155,6 +155,7 @@ private:
void parseStatistics(unsigned int frame,
int64_t frameTimestamp,
const ipu3_uapi_stats_3a *stats);
+ bool validateSensorControls();
void setControls(unsigned int frame);
void calculateBdsGrid(const Size &bdsOutputSize);
@@ -269,6 +270,28 @@ void IPAIPU3::updateControls(const IPACameraSensorInfo &sensorInfo,
}
/**
+ * \brief Validate that the sensor controls mandatory for the IPA exists
+ */
+bool IPAIPU3::validateSensorControls()
+{
+ static const uint32_t ctrls[] = {
+ V4L2_CID_ANALOGUE_GAIN,
+ V4L2_CID_EXPOSURE,
+ V4L2_CID_VBLANK,
+ };
+
+ for (auto c : ctrls) {
+ if (sensorCtrls_.find(c) == sensorCtrls_.end()) {
+ LOG(IPAIPU3, Error) << "Unable to find sensor control "
+ << utils::hex(c);
+ return false;
+ }
+ }
+
+ return true;
+}
+
+/**
* \brief Initialize the IPA module and its controls
*
* This function receives the camera sensor information from the pipeline
@@ -433,6 +456,11 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo,
/* Clean frameContext at each reconfiguration. */
context_.frameContext = {};
+ if (!validateSensorControls()) {
+ LOG(IPAIPU3, Error) << "Sensor control validation failed.";
+ return -EINVAL;
+ }
+
/* Update the camera controls using the new sensor settings. */
updateControls(sensorInfo_, sensorCtrls_, ipaControls);