From ee477efde8e49e26cc02437fd50a45cd439ee65e Mon Sep 17 00:00:00 2001
From: Naushir Patuck <naush@raspberrypi.com>
Date: Fri, 27 Nov 2020 14:56:12 +0000
Subject: pipeline: ipa: raspberrypi: Handle failures during IPA configuration
If the IPA fails during configuration, return an error flag to the
pipeline handler and fail the use case gracefully.
At present, the IPA configuration can fail for the following reasons:
- The sensor is not recognised, and fails to open a CamHelper object.
- The pipeline handler did not pass in controls for the ISP and sensor.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
src/ipa/raspberrypi/raspberrypi.cpp | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
(limited to 'src/ipa/raspberrypi')
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index 29d48b1b..5824d3b5 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -197,8 +197,11 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,
const IPAOperationData &ipaConfig,
IPAOperationData *result)
{
- if (entityControls.empty())
+ if (entityControls.size() != 2) {
+ LOG(IPARPI, Error) << "No ISP or sensor controls found.";
+ result->operation = RPi::IPA_CONFIG_FAILED;
return;
+ }
result->operation = 0;
@@ -217,6 +220,13 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,
if (!helper_) {
helper_ = std::unique_ptr<RPiController::CamHelper>(RPiController::CamHelper::Create(cameraName));
+ if (!helper_) {
+ LOG(IPARPI, Error) << "Could not create camera helper for "
+ << cameraName;
+ result->operation = RPi::IPA_CONFIG_FAILED;
+ return;
+ }
+
/*
* Pass out the sensor config to the pipeline handler in order
* to setup the staggered writer class.
--
cgit v1.2.1