summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2020-12-04 15:31:20 +0000
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-12-08 14:30:06 +0200
commit0238b9e080bcf765f4a3ea9c7be1681cd0c3bb1f (patch)
tree31b925acb2897fc78f20d0a13fa4743bf55159f6 /test
parenta62b35b8c07ee83c4f0e9ee741f3226d47fe3f87 (diff)
libcamera: ipa: Pass a set of controls and return results from ipa::start()
This change allows controls passed into PipelineHandler::start to be forwarded onto IPAInterface::start(). We also add a return channel if the pipeline handler must action any of these controls, e.g. setting the analogue gain or shutter speed in the sensor device. The IPA interface wrapper isn't addressed as it will soon be replaced by a new mechanism to handle IPC. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: David Plowman <david.plowman@raspberrypi.com> Tested-by: David Plowman <david.plowman@raspberrypi.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'test')
-rw-r--r--test/ipa/ipa_interface_test.cpp3
-rw-r--r--test/ipa/ipa_wrappers_test.cpp5
2 files changed, 5 insertions, 3 deletions
diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp
index 9f575f93..dbb6727f 100644
--- a/test/ipa/ipa_interface_test.cpp
+++ b/test/ipa/ipa_interface_test.cpp
@@ -120,7 +120,8 @@ protected:
}
/* Test start of IPA module. */
- ipa_->start();
+ IPAOperationData data = {};
+ ipa_->start(data, nullptr);
timer.start(1000);
while (timer.isRunning() && trace_ != IPAOperationStart)
dispatcher->processEvents();
diff --git a/test/ipa/ipa_wrappers_test.cpp b/test/ipa/ipa_wrappers_test.cpp
index 59d991cb..47533d10 100644
--- a/test/ipa/ipa_wrappers_test.cpp
+++ b/test/ipa/ipa_wrappers_test.cpp
@@ -56,7 +56,8 @@ public:
return 0;
}
- int start() override
+ int start([[maybe_unused]] const IPAOperationData &data,
+ [[maybe_unused]] IPAOperationData *result) override
{
report(Op_start, TestPass);
return 0;
@@ -376,7 +377,7 @@ protected:
return TestFail;
}
- ret = INVOKE(start);
+ ret = INVOKE(start, ipaConfig, nullptr);
if (ret == TestFail) {
cerr << "Failed to run start()";
return TestFail;