From 4e51845a38d4684c4cc7ef724dbf45618b1a21e9 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Thu, 3 Oct 2019 17:20:33 +0200 Subject: ipa: vimc: Rename ipa_dummy to ipa_vimc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The DummyIPA is actually a test IPA module for the virtual media controller driver VIMC. Rename it accordingly to its usage. Reviewed-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Signed-off-by: Jacopo Mondi --- src/ipa/ipa_dummy.cpp | 46 ---------------------------------------------- src/ipa/ipa_vimc.cpp | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/ipa/meson.build | 10 +++++----- test/ipa/ipa_test.cpp | 2 +- 4 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 src/ipa/ipa_dummy.cpp create mode 100644 src/ipa/ipa_vimc.cpp diff --git a/src/ipa/ipa_dummy.cpp b/src/ipa/ipa_dummy.cpp deleted file mode 100644 index 9d0cbdc8..00000000 --- a/src/ipa/ipa_dummy.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * ipa_dummy.cpp - Dummy Image Processing Algorithm module - */ - -#include - -#include -#include - -namespace libcamera { - -class IPADummy : public IPAInterface -{ -public: - int init(); -}; - -int IPADummy::init() -{ - std::cout << "initializing 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", - LICENSE, -}; - -IPAInterface *ipaCreate() -{ - return new IPADummy(); -} -}; - -}; /* namespace libcamera */ diff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/ipa_vimc.cpp new file mode 100644 index 00000000..abc06e7f --- /dev/null +++ b/src/ipa/ipa_vimc.cpp @@ -0,0 +1,46 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * ipa_vimc.cpp - Vimc Image Processing Algorithm module + */ + +#include + +#include +#include + +namespace libcamera { + +class IPAVimc : public IPAInterface +{ +public: + int init(); +}; + +int IPAVimc::init() +{ + std::cout << "initializing vimc 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", + LICENSE, +}; + +IPAInterface *ipaCreate() +{ + return new IPAVimc(); +} +}; + +}; /* namespace libcamera */ diff --git a/src/ipa/meson.build b/src/ipa/meson.build index f09915bc..b5bcd7b2 100644 --- a/src/ipa/meson.build +++ b/src/ipa/meson.build @@ -1,12 +1,12 @@ -ipa_dummy_sources = [ - ['ipa_dummy', 'LGPL-2.1-or-later'], - ['ipa_dummy_isolate', 'Proprietary'], +ipa_vimc_sources = [ + ['ipa_vimc', 'LGPL-2.1-or-later'], + ['ipa_vimc_isolate', 'Proprietary'], ] ipa_install_dir = join_paths(get_option('libdir'), 'libcamera') -foreach t : ipa_dummy_sources - ipa = shared_module(t[0], 'ipa_dummy.cpp', +foreach t : ipa_vimc_sources + ipa = shared_module(t[0], 'ipa_vimc.cpp', name_prefix : '', include_directories : libcamera_includes, install : true, diff --git a/test/ipa/ipa_test.cpp b/test/ipa/ipa_test.cpp index b9e1bd61..8f9b2d80 100644 --- a/test/ipa/ipa_test.cpp +++ b/test/ipa/ipa_test.cpp @@ -62,7 +62,7 @@ protected: "GPL-2.0-or-later", }; - count += runTest("src/ipa/ipa_dummy.so", testInfo); + count += runTest("src/ipa/ipa_vimc.so", testInfo); if (count < 0) return TestFail; -- cgit v1.2.1