From 132d99bc8fac63d7473de6f62f7860b149f8e1c2 Mon Sep 17 00:00:00 2001
From: Jacopo Mondi <jacopo@jmondi.org>
Date: Sun, 15 Sep 2019 17:30:26 +0300
Subject: ipa: Switch to the plain C API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Switch IPA communication to the plain C API. As the IPAInterface class
is easier to use for pipeline handlers than a plain C API, retain it and
add an IPAContextWrapper that translate between the C++ and the C APIs.

On the IPA module side usage of IPAInterface may be desired for IPAs
implemented in C++ that want to link to libcamera. For those IPAs, a new
IPAInterfaceWrapper helper class is introduced to wrap the IPAInterface
implemented internally by the IPA module into an ipa_context,
ipa_context_ops and ipa_callback_ops.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 src/ipa/rkisp1/meson.build | 3 ++-
 src/ipa/rkisp1/rkisp1.cpp  | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/ipa/rkisp1')

diff --git a/src/ipa/rkisp1/meson.build b/src/ipa/rkisp1/meson.build
index 1cab319c..521518bd 100644
--- a/src/ipa/rkisp1/meson.build
+++ b/src/ipa/rkisp1/meson.build
@@ -1,7 +1,8 @@
 rkisp1_ipa = shared_module('ipa_rkisp1',
                            'rkisp1.cpp',
                            name_prefix : '',
-                           include_directories : ipa_includes,
+                           include_directories : [ipa_includes, libipa_includes],
                            dependencies : libcamera_dep,
+                           link_with : libipa,
                            install : true,
                            install_dir : ipa_install_dir)
diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp
index 41babf0c..744a16ae 100644
--- a/src/ipa/rkisp1/rkisp1.cpp
+++ b/src/ipa/rkisp1/rkisp1.cpp
@@ -19,6 +19,7 @@
 #include <libcamera/buffer.h>
 #include <libcamera/control_ids.h>
 #include <libcamera/request.h>
+#include <libipa/ipa_interface_wrapper.h>
 
 #include "log.h"
 #include "utils.h"
@@ -247,9 +248,9 @@ const struct IPAModuleInfo ipaModuleInfo = {
 	"LGPL-2.1-or-later",
 };
 
-IPAInterface *ipaCreate()
+struct ipa_context *ipaCreate()
 {
-	return new IPARkISP1();
+	return new IPAInterfaceWrapper(utils::make_unique<IPARkISP1>());
 }
 }
 
-- 
cgit v1.2.1