From 5aef8257643bc2c70adaa59cc8ef0f2780595cbc Mon Sep 17 00:00:00 2001
From: Jacopo Mondi <jacopo@jmondi.org>
Date: Mon, 4 Feb 2019 16:33:01 +0100
Subject: libcamera: Provide a Request object
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implement a Request object used by applications to queue image capture
requests to a camera.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 include/libcamera/camera.h    |  3 +++
 include/libcamera/libcamera.h |  1 +
 include/libcamera/meson.build |  1 +
 include/libcamera/request.h   | 44 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 include/libcamera/request.h

(limited to 'include')

diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h
index 4940c344..bbe2696e 100644
--- a/include/libcamera/camera.h
+++ b/include/libcamera/camera.h
@@ -11,10 +11,12 @@
 #include <memory>
 #include <string>
 
+#include <libcamera/request.h>
 #include <libcamera/signal.h>
 
 namespace libcamera {
 
+class Buffer;
 class PipelineHandler;
 class Stream;
 class StreamConfiguration;
@@ -31,6 +33,7 @@ public:
 
 	const std::string &name() const;
 
+	Signal<Request *, const std::map<Stream *, Buffer *> &> requestCompleted;
 	Signal<Camera *> disconnected;
 
 	int acquire();
diff --git a/include/libcamera/libcamera.h b/include/libcamera/libcamera.h
index 8167e809..dda576e9 100644
--- a/include/libcamera/libcamera.h
+++ b/include/libcamera/libcamera.h
@@ -12,6 +12,7 @@
 #include <libcamera/camera_manager.h>
 #include <libcamera/event_dispatcher.h>
 #include <libcamera/event_notifier.h>
+#include <libcamera/request.h>
 #include <libcamera/signal.h>
 #include <libcamera/stream.h>
 #include <libcamera/timer.h>
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index 8c14423b..5788e9bb 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -5,6 +5,7 @@ libcamera_api = files([
     'event_dispatcher.h',
     'event_notifier.h',
     'libcamera.h',
+    'request.h',
     'signal.h',
     'stream.h',
     'timer.h',
diff --git a/include/libcamera/request.h b/include/libcamera/request.h
new file mode 100644
index 00000000..ef081177
--- /dev/null
+++ b/include/libcamera/request.h
@@ -0,0 +1,44 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2019, Google Inc.
+ *
+ * request.h - Capture request handling
+ */
+#ifndef __LIBCAMERA_REQUEST_H__
+#define __LIBCAMERA_REQUEST_H__
+
+#include <map>
+#include <unordered_set>
+
+#include <libcamera/signal.h>
+
+namespace libcamera {
+
+class Buffer;
+class Camera;
+class Stream;
+
+class Request
+{
+public:
+	explicit Request(Camera *camera);
+	Request(const Request &) = delete;
+	Request &operator=(const Request &) = delete;
+
+	int setBuffers(const std::map<Stream *, Buffer *> &streamMap);
+	Buffer *findBuffer(Stream *stream) const;
+
+private:
+	friend class Camera;
+
+	int prepare();
+	void bufferCompleted(Buffer *buffer);
+
+	Camera *camera_;
+	std::map<Stream *, Buffer *> bufferMap_;
+	std::unordered_set<Buffer *> pending_;
+};
+
+} /* namespace libcamera */
+
+#endif /* __LIBCAMERA_REQUEST_H__ */
-- 
cgit v1.2.1