{"id":10039,"url":"https://patchwork.libcamera.org/api/patches/10039/?format=json","web_url":"https://patchwork.libcamera.org/patch/10039/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20201009133956.77396-2-jacopo@jmondi.org>","date":"2020-10-09T13:39:55","name":"[libcamera-devel,1/2] android: camera_worker: Introduce CameraWorker","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"7748905de7a35c1a8da1698980fd359b12ccbc72","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10039/mbox/","series":[{"id":1371,"url":"https://patchwork.libcamera.org/api/series/1371/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1371","date":"2020-10-09T13:39:54","name":"android: Introduce CameraWorker","version":1,"mbox":"https://patchwork.libcamera.org/series/1371/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10039/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10039/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id C364CBEEE0\n\tfor ;\n\tFri, 9 Oct 2020 13:36:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9A9576081E;\n\tFri, 9 Oct 2020 15:36:30 +0200 (CEST)","from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[217.70.183.199])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1456060358\n\tfor ;\n\tFri, 9 Oct 2020 15:36:29 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 95BB4FF804;\n\tFri, 9 Oct 2020 13:36:28 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 9 Oct 2020 15:39:55 +0200","Message-Id":"<20201009133956.77396-2-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20201009133956.77396-1-jacopo@jmondi.org>","References":"<20201009133956.77396-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 1/2] android: camera_worker: Introduce\n\tCameraWorker","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The Android camera framework provides for each buffer part of a capture\nrequest an acquisition fence the camera HAL is supposed to wait on\nbefore using the buffer. As the libcamera HAL runs in the camera service\nthread, it is not possible to perform a synchronous wait there.\n\nIntroduce a CameraWorker class that runs an internal thread to wait\non a set of fences before queueing a capture request to the\nlibcamera::Camera.\n\nFences completion is handled through a simple poll, similar in\nimplementation to the sync_wait() function provided by libdrm.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_worker.cpp | 88 +++++++++++++++++++++++++++++++++++\n src/android/camera_worker.h | 73 +++++++++++++++++++++++++++++\n src/android/meson.build | 1 +\n 3 files changed, 162 insertions(+)\n create mode 100644 src/android/camera_worker.cpp\n create mode 100644 src/android/camera_worker.h","diff":"diff --git a/src/android/camera_worker.cpp b/src/android/camera_worker.cpp\nnew file mode 100644\nindex 000000000000..775473da9f6e\n--- /dev/null\n+++ b/src/android/camera_worker.cpp\n@@ -0,0 +1,88 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2020, Google Inc.\n+ *\n+ * camera_worker.cpp - Process capture request on behalf of the Camera HAL\n+ */\n+\n+#include \"camera_worker.h\"\n+\n+#include \n+#include \n+\n+#include \"camera_device.h\"\n+\n+using namespace libcamera;\n+\n+void CaptureRequest::addBuffer(Stream *stream, FrameBuffer *buffer, int fence)\n+{\n+\trequest_->addBuffer(stream, buffer);\n+\tacquireFences_.push_back(fence);\n+}\n+\n+void CaptureRequest::queue(Camera *camera)\n+{\n+\tcamera->queueRequest(request_);\n+}\n+\n+CameraWorker::CameraWorker(const std::shared_ptr &camera)\n+\t: worker_(camera)\n+{\n+\tworker_.moveToThread(&thread_);\n+}\n+\n+void CameraWorker::start()\n+{\n+\tthread_.start();\n+}\n+\n+void CameraWorker::stop()\n+{\n+\tthread_.exit();\n+\tthread_.wait();\n+}\n+\n+void CameraWorker::queueRequest(std::unique_ptr request)\n+{\n+\tCaptureRequest *req = request.release();\n+\tworker_.invokeMethod(&Worker::processRequest, ConnectionTypeQueued, req);\n+}\n+\n+int CameraWorker::Worker::waitFence(int fence)\n+{\n+\tstruct pollfd fds = { fence, POLLIN, 0 };\n+\tconstexpr unsigned int timeoutMs = 300;\n+\tint ret;\n+\n+\tdo {\n+\t\tret = poll(&fds, 1, timeoutMs);\n+\t\tif (ret == 0)\n+\t\t\treturn -ETIME;\n+\n+\t\tif (ret > 0) {\n+\t\t\tif (fds.revents & (POLLERR | POLLNVAL))\n+\t\t\t\treturn -EINVAL;\n+\n+\t\t\treturn 0;\n+\t\t}\n+\t} while (ret == -1 && (errno == EINTR || errno == EAGAIN));\n+\n+\treturn ret;\n+}\n+\n+void CameraWorker::Worker::processRequest(CaptureRequest *request)\n+{\n+\tfor (int fence : request->fences()) {\n+\t\tif (fence == -1)\n+\t\t\tcontinue;\n+\n+\t\tint ret = waitFence(fence);\n+\t\tif (ret < 0)\n+\t\t\treturn;\n+\n+\t\tclose(fence);\n+\t}\n+\n+\trequest->queue(camera_.get());\n+\tdelete request;\n+}\ndiff --git a/src/android/camera_worker.h b/src/android/camera_worker.h\nnew file mode 100644\nindex 000000000000..7e193513d6f4\n--- /dev/null\n+++ b/src/android/camera_worker.h\n@@ -0,0 +1,73 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2020, Google Inc.\n+ *\n+ * camera_worker.h - Process capture request on behalf of the Camera HAL\n+ */\n+#ifndef __ANDROID_CAMERA_WORKER_H__\n+#define __ANDROID_CAMERA_WORKER_H__\n+\n+#include \n+\n+#include \n+#include \n+#include \n+#include \n+#include \n+\n+#include \"libcamera/internal/thread.h\"\n+\n+class CameraDevice;\n+\n+struct CaptureRequest {\n+\tCaptureRequest(libcamera::Request *request)\n+\t\t: request_(request)\n+\t{\n+\t}\n+\n+\tconst std::vector &fences() const { return acquireFences_; }\n+\n+\tvoid addBuffer(libcamera::Stream *stream,\n+\t\t libcamera::FrameBuffer *buffer, int fence);\n+\tvoid queue(libcamera::Camera *camera);\n+\n+private:\n+\tstd::vector acquireFences_;\n+\tlibcamera::Request *request_;\n+};\n+\n+class CameraWorker\n+{\n+public:\n+\tCameraWorker(const std::shared_ptr &camera);\n+\n+\tvoid start();\n+\tvoid stop();\n+\n+\tvoid queueRequest(std::unique_ptr request);\n+\n+private:\n+\tclass Worker : public libcamera::Object\n+\t{\n+\tpublic:\n+\t\tWorker(const std::shared_ptr &camera)\n+\t\t\t: camera_(camera)\n+\t\t{\n+\t\t}\n+\t\t~Worker()\n+\t\t{\n+\t\t}\n+\n+\t\tvoid processRequest(CaptureRequest *request);\n+\n+\tprivate:\n+\t\tint waitFence(int fence);\n+\n+\t\tconst std::shared_ptr camera_;\n+\t};\n+\n+\tWorker worker_;\n+\tlibcamera::Thread thread_;\n+};\n+\n+#endif /* __ANDROID_CAMERA_WORKER_H__ */\ndiff --git a/src/android/meson.build b/src/android/meson.build\nindex 802bb89afe57..b2b2293cf62d 100644\n--- a/src/android/meson.build\n+++ b/src/android/meson.build\n@@ -21,6 +21,7 @@ android_hal_sources = files([\n 'camera_metadata.cpp',\n 'camera_ops.cpp',\n 'camera_stream.cpp',\n+ 'camera_worker.cpp',\n 'jpeg/encoder_libjpeg.cpp',\n 'jpeg/exif.cpp',\n ])\n","prefixes":["libcamera-devel","1/2"]}