diff options
| -rw-r--r-- | src/ipa/ipa_dummy.cpp | 2 | ||||
| -rw-r--r-- | src/ipa/ipa_dummy_isolate.cpp | 47 | ||||
| -rw-r--r-- | src/ipa/meson.build | 10 |
3 files changed, 6 insertions, 53 deletions
diff --git a/src/ipa/ipa_dummy.cpp b/src/ipa/ipa_dummy.cpp index 9313aabd..9d0cbdc8 100644 --- a/src/ipa/ipa_dummy.cpp +++ b/src/ipa/ipa_dummy.cpp @@ -34,7 +34,7 @@ const struct IPAModuleInfo ipaModuleInfo = { 0, "PipelineHandlerVimc", "Dummy IPA for Vimc", - "LGPL-2.1-or-later", + LICENSE, }; IPAInterface *ipaCreate() diff --git a/src/ipa/ipa_dummy_isolate.cpp b/src/ipa/ipa_dummy_isolate.cpp deleted file mode 100644 index cd66626d..00000000 --- a/src/ipa/ipa_dummy_isolate.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * ipa_dummy_isolate.cpp - Dummy Image Processing Algorithm module that needs - * to be isolated - */ - -#include <iostream> - -#include <ipa/ipa_interface.h> -#include <ipa/ipa_module_info.h> - -namespace libcamera { - -class IPADummyIsolate : public IPAInterface -{ -public: - int init(); -}; - -int IPADummyIsolate::init() -{ - std::cout << "initializing isolated dummy IPA!" << std::endl; - return 0; -} - -/* - * External IPA module interface - */ - -extern "C" { -const struct IPAModuleInfo ipaModuleInfo = { - IPA_MODULE_API_VERSION, - 0, - "PipelineHandlerVimc", - "Dummy IPA for Vimc that needs to be isolated", - "Proprietary", -}; - -IPAInterface *ipaCreate() -{ - return new IPADummyIsolate(); -} -}; - -}; /* namespace libcamera */ diff --git a/src/ipa/meson.build b/src/ipa/meson.build index 2b9863bc..f09915bc 100644 --- a/src/ipa/meson.build +++ b/src/ipa/meson.build @@ -1,17 +1,17 @@ ipa_dummy_sources = [ - ['ipa_dummy', 'ipa_dummy.cpp'], - ['ipa_dummy_isolate', 'ipa_dummy_isolate.cpp'], + ['ipa_dummy', 'LGPL-2.1-or-later'], + ['ipa_dummy_isolate', 'Proprietary'], ] ipa_install_dir = join_paths(get_option('libdir'), 'libcamera') foreach t : ipa_dummy_sources - ipa = shared_module(t[0], - t[1], + ipa = shared_module(t[0], 'ipa_dummy.cpp', name_prefix : '', include_directories : libcamera_includes, install : true, - install_dir : ipa_install_dir) + install_dir : ipa_install_dir, + cpp_args : '-DLICENSE="' + t[1] + '"') endforeach config_h.set('IPA_MODULE_DIR', |