diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-09-14 22:47:28 +0300 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-09-15 13:57:08 +0300 |
commit | 1e704c84a946f988c290169f060aa088d53fc4a8 (patch) | |
tree | eaeea3e6465ca1e04d6003e8bd14731e74645221 /include/libcamera | |
parent | cecfeed61e8bcb4b53c2ed8e1b26d8c8af38b8e3 (diff) |
libcamera: Move ipa includes to the same level as libcamera
The ipa includes are located in include/libcamera/ipa/. This gives an
incorrect impression that they are a sub-part of the rest of the
libcamera API, while they are the API towards the IPA the same way that
include/libcamera/ contains the API towards applications. To clarify
this, move them to include/ipa/.
The IPA headers are however still part of libcamera, so installing them
to ${prefix}/include/ipa/ would make little sense. To fix this, move the
application facing API to ${prefix}/include/libcamera/libcamera/ when
installed, and the IPA to ${prefix}/include/libcamera/ipa/. When major
versions of libcamera will be released, they could then be installed
side by side in ${prefix}/include/libcamera-${version}/.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'include/libcamera')
-rw-r--r-- | include/libcamera/ipa/ipa_interface.h | 22 | ||||
-rw-r--r-- | include/libcamera/ipa/ipa_module_info.h | 30 | ||||
-rw-r--r-- | include/libcamera/meson.build | 10 |
3 files changed, 5 insertions, 57 deletions
diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h deleted file mode 100644 index 2c5eb1fd..00000000 --- a/include/libcamera/ipa/ipa_interface.h +++ /dev/null @@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * ipa_interface.h - Image Processing Algorithm interface - */ -#ifndef __LIBCAMERA_IPA_INTERFACE_H__ -#define __LIBCAMERA_IPA_INTERFACE_H__ - -namespace libcamera { - -class IPAInterface -{ -public: - virtual ~IPAInterface() {} - - virtual int init() = 0; -}; - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_IPA_INTERFACE_H__ */ diff --git a/include/libcamera/ipa/ipa_module_info.h b/include/libcamera/ipa/ipa_module_info.h deleted file mode 100644 index d9e33c1d..00000000 --- a/include/libcamera/ipa/ipa_module_info.h +++ /dev/null @@ -1,30 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * ipa_module_info.h - Image Processing Algorithm module information - */ -#ifndef __LIBCAMERA_IPA_MODULE_INFO_H__ -#define __LIBCAMERA_IPA_MODULE_INFO_H__ - -#include <stdint.h> - -#define IPA_MODULE_API_VERSION 1 - -namespace libcamera { - -struct IPAModuleInfo { - int moduleAPIVersion; - uint32_t pipelineVersion; - char pipelineName[256]; - char name[256]; - char license[64]; -} __attribute__((packed)); - -extern "C" { -extern const struct IPAModuleInfo ipaModuleInfo; -}; - -}; /* namespace libcamera */ - -#endif /* __LIBCAMERA_IPA_MODULE_INFO_H__ */ diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index a8a38a9b..868f1a6b 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -8,8 +8,6 @@ libcamera_api = files([ 'event_dispatcher.h', 'event_notifier.h', 'geometry.h', - 'ipa/ipa_interface.h', - 'ipa/ipa_module_info.h', 'logging.h', 'object.h', 'request.h', @@ -18,6 +16,8 @@ libcamera_api = files([ 'timer.h', ]) +include_dir = join_paths(libcamera_include_dir, 'libcamera') + gen_header = files('gen-header.sh') libcamera_h = custom_target('gen-header', @@ -25,7 +25,7 @@ libcamera_h = custom_target('gen-header', output : 'libcamera.h', command : [gen_header, meson.current_source_dir(), '@OUTPUT@'], install : true, - install_dir : 'include/libcamera') + install_dir : join_paths('include', include_dir)) version = libcamera_version.split('.') libcamera_version_config = configuration_data() @@ -36,7 +36,7 @@ libcamera_version_config.set('LIBCAMERA_VERSION_PATCH', version[2]) configure_file(input : 'version.h.in', output : 'version.h', configuration : libcamera_version_config, - install_dir : 'include/libcamera') + install_dir : join_paths('include', include_dir)) install_headers(libcamera_api, - subdir : 'libcamera') + subdir : include_dir) |