diff options
Diffstat (limited to 'test/ipa')
| -rw-r--r-- | test/ipa/ipa_interface_test.cpp | 17 | ||||
| -rw-r--r-- | test/ipa/ipa_module_test.cpp | 4 | ||||
| -rw-r--r-- | test/ipa/meson.build | 10 |
3 files changed, 18 insertions, 13 deletions
diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp index 3c0df843..e840f6ab 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -2,7 +2,7 @@ /* * Copyright (C) 2019, Google Inc. * - * ipa_interface_test.cpp - Test the IPA interface + * Test the IPA interface */ #include <fcntl.h> @@ -16,6 +16,7 @@ #include <libcamera/base/event_dispatcher.h> #include <libcamera/base/event_notifier.h> +#include <libcamera/base/object.h> #include <libcamera/base/thread.h> #include <libcamera/base/timer.h> @@ -52,10 +53,10 @@ protected: ipaManager_ = make_unique<IPAManager>(); /* Create a pipeline handler for vimc. */ - std::vector<PipelineHandlerFactory *> &factories = - PipelineHandlerFactory::factories(); - for (PipelineHandlerFactory *factory : factories) { - if (factory->name() == "PipelineHandlerVimc") { + const std::vector<PipelineHandlerFactoryBase *> &factories = + PipelineHandlerFactoryBase::factories(); + for (const PipelineHandlerFactoryBase *factory : factories) { + if (factory->name() == "vimc") { pipe_ = factory->create(nullptr); break; } @@ -106,7 +107,11 @@ protected: /* Test initialization of IPA module. */ std::string conf = ipa_->configurationFile("vimc.conf"); - int ret = ipa_->init(IPASettings{ conf, "vimc" }); + Flags<ipa::vimc::TestFlag> inFlags; + Flags<ipa::vimc::TestFlag> outFlags; + int ret = ipa_->init(IPASettings{ conf, "vimc" }, + ipa::vimc::IPAOperationInit, + inFlags, &outFlags); if (ret < 0) { cerr << "IPA interface init() failed" << endl; return TestFail; diff --git a/test/ipa/ipa_module_test.cpp b/test/ipa/ipa_module_test.cpp index bd5e0e4c..1c97da32 100644 --- a/test/ipa/ipa_module_test.cpp +++ b/test/ipa/ipa_module_test.cpp @@ -2,7 +2,7 @@ /* * Copyright (C) 2019, Google Inc. * - * ipa_module_test.cpp - Test loading of the VIMC IPA module and verify its info + * Test loading of the VIMC IPA module and verify its info */ #include <iostream> @@ -57,7 +57,7 @@ protected: const struct IPAModuleInfo testInfo = { IPA_MODULE_API_VERSION, 0, - "PipelineHandlerVimc", + "vimc", "vimc", }; diff --git a/test/ipa/meson.build b/test/ipa/meson.build index 7938633e..180b0da0 100644 --- a/test/ipa/meson.build +++ b/test/ipa/meson.build @@ -1,15 +1,15 @@ # SPDX-License-Identifier: CC0-1.0 ipa_test = [ - ['ipa_module_test', 'ipa_module_test.cpp'], - ['ipa_interface_test', 'ipa_interface_test.cpp'], + {'name': 'ipa_module_test', 'sources': ['ipa_module_test.cpp']}, + {'name': 'ipa_interface_test', 'sources': ['ipa_interface_test.cpp']}, ] -foreach t : ipa_test - exe = executable(t[0], [t[1], libcamera_generated_ipa_headers], +foreach test : ipa_test + exe = executable(test['name'], test['sources'], libcamera_generated_ipa_headers, dependencies : libcamera_private, link_with : [libipa, test_libraries], include_directories : [libipa_includes, test_includes_internal]) - test(t[0], exe, suite : 'ipa') + test(test['name'], exe, suite : 'ipa') endforeach |