Patch Detail
Show a patch.
GET /api/1.1/patches/14293/?format=api
{ "id": 14293, "url": "https://patchwork.libcamera.org/api/1.1/patches/14293/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14293/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20211023103302.152769-8-umang.jain@ideasonboard.com>", "date": "2021-10-23T10:33:02", "name": "[libcamera-devel,v6,7/7] android: post_processor: Make post processing async", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "d09cd1072adcb16ef4173ec2973262d53dcab2c6", "submitter": { "id": 86, "url": "https://patchwork.libcamera.org/api/1.1/people/86/?format=api", "name": "Umang Jain", "email": "umang.jain@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14293/mbox/", "series": [ { "id": 2652, "url": "https://patchwork.libcamera.org/api/1.1/series/2652/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2652", "date": "2021-10-23T10:32:55", "name": "Async Post Processor", "version": 6, "mbox": "https://patchwork.libcamera.org/series/2652/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14293/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14293/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 4A8A2BDB1C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 23 Oct 2021 10:33:26 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 05D2264872;\n\tSat, 23 Oct 2021 12:33:26 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1F1DD60239\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 23 Oct 2021 12:33:24 +0200 (CEST)", "from perceval.ideasonboard.com (unknown [103.251.226.213])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D0398547;\n\tSat, 23 Oct 2021 12:33:22 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"IuOuLXkc\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1634985203;\n\tbh=25zdqmzY5/GaMN86SNuiqtF6L56NB0UJK7k6TU006ZM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=IuOuLXkcU7isq3lHnbMAANhI5y87jqZYXSb5OTMyPBLWCa33ITgtpN5N136XAGRtP\n\tavBRRul7ShpZvsfSbEEgn45q133N7sx7VOOzifGXvGNddAf0Wby1Dz6skQpABjfQEc\n\tCEVIJvb14EHNEVAEuBjPAUccQCcA9OYAhOzSHI/I=", "From": "Umang Jain <umang.jain@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sat, 23 Oct 2021 16:03:02 +0530", "Message-Id": "<20211023103302.152769-8-umang.jain@ideasonboard.com>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20211023103302.152769-1-umang.jain@ideasonboard.com>", "References": "<20211023103302.152769-1-umang.jain@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v6 7/7] android: post_processor: Make post\n\tprocessing async", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Introduce a dedicated worker class derived from libcamera::Thread.\nThe worker class maintains a queue for post-processing requests\nand waits for a post-processing request to become available.\nIt will process them as per FIFO before de-queuing it from the\nqueue.\n\nThe post processing streams loop in CameraDevice::requestComplete()\nis tweaked a bit to better suit asynchronous needs of post processing.\nAlso, the entire iteration is locked under streamProcessMutex_ which\nhelps us to queue all the post-processing request at once, before any\nof the post-processing completion slot (streamProcessingComplete())\nis allowed to run for post-processing requests completing in parallel.\nThis helps us to manage both synchronous and asynchronous errors\nencountered during the entire post processing operation.\n\nThis patch also implements a flush() for the PostProcessorWorker\nclass which is responsible to purge post-processing requests\nqueued up while a camera is stopping/flushing. It is hooked with\nCameraStream::flush(), which isn't used currently but will be\nused when we handle flush/stop scenarios in greater detail\nsubsequently (in a different patchset).\n\nThe libcamera request completion handler CameraDevice::requestComplete()\nassumes that the request that has just completed is at the front of the\nqueue. Now that the post-processor runs asynchronously, this isn't true\nanymore, a request being post-processed will stay in the queue and a new\nlibcamera request may complete. Remove that assumption, and use the\nrequest cookie to obtain the Camera3RequestDescriptor.\n\nSigned-off-by: Umang Jain <umang.jain@ideasonboard.com>\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/android/camera_device.cpp | 49 +++++------------\n src/android/camera_stream.cpp | 101 ++++++++++++++++++++++++++++++++--\n src/android/camera_stream.h | 38 ++++++++++++-\n 3 files changed, 148 insertions(+), 40 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 3114def0..dc39467b 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1026,29 +1026,8 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \n void CameraDevice::requestComplete(Request *request)\n {\n-\tCamera3RequestDescriptor *descriptor;\n-\t{\n-\t\tMutexLocker descriptorsLock(descriptorsMutex_);\n-\t\tASSERT(!descriptors_.empty());\n-\t\tdescriptor = descriptors_.front().get();\n-\t}\n-\n-\tif (descriptor->request_->cookie() != request->cookie()) {\n-\t\t/*\n-\t\t * \\todo Clarify if the Camera has to be closed on\n-\t\t * ERROR_DEVICE.\n-\t\t */\n-\t\tLOG(HAL, Error)\n-\t\t\t<< \"Out-of-order completion for request \"\n-\t\t\t<< utils::hex(request->cookie());\n-\n-\t\tMutexLocker descriptorsLock(descriptorsMutex_);\n-\t\tdescriptors_.pop();\n-\n-\t\tnotifyError(0, nullptr, CAMERA3_MSG_ERROR_DEVICE);\n-\n-\t\treturn;\n-\t}\n+\tCamera3RequestDescriptor *descriptor =\n+\t\treinterpret_cast<Camera3RequestDescriptor *>(request->cookie());\n \n \t/*\n \t * Prepare the capture result for the Android camera stack.\n@@ -1124,12 +1103,16 @@ void CameraDevice::requestComplete(Request *request)\n \n \t/* Handle post-processing. */\n \tbool needPostProcessing = false;\n+\tMutexLocker locker(descriptor->streamsProcessMutex_);\n+\n \t/*\n-\t * \\todo Protect the loop below with streamProcessMutex_ when post\n-\t * processor runs asynchronously.\n+\t * Queue all the post-processing streams request at once. The completion\n+\t * slot streamProcessingComplete() can only execute when we are out\n+\t * this critical section. This helps to handle synchronous errors here\n+\t * itself.\n \t */\n \tauto iter = descriptor->pendingStreamsToProcess_.begin();\n-\twhile (descriptor->pendingStreamsToProcess_.size() > 0) {\n+\twhile (iter != descriptor->pendingStreamsToProcess_.end()) {\n \t\tCameraStream *stream = iter->first;\n \t\tCamera3RequestDescriptor::StreamBuffer *buffer = iter->second;\n \t\tneedPostProcessing = true;\n@@ -1151,18 +1134,16 @@ void CameraDevice::requestComplete(Request *request)\n \t}\n \n \tif (needPostProcessing) {\n-\t\t/*\n-\t\t * \\todo We will require to check if we failed to queue\n-\t\t * post-processing requests when we migrate to post-processor\n-\t\t * running asynchronously.\n-\t\t *\n-\t\t * if (descriptor->pendingStreamsToProcess_.size() == 0)\n-\t\t *\tcompleteDescriptor(descriptor);\n-\t\t */\n+\t\tif (descriptor->pendingStreamsToProcess_.size() == 0) {\n+\t\t\tlocker.unlock();\n+\t\t\tcompleteDescriptor(descriptor);\n+\t\t}\n \n \t\treturn;\n \t}\n \n+\tlocker.unlock();\n+\n \tcompleteDescriptor(descriptor);\n }\n \ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex 45d0607d..68b916e9 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -99,6 +99,7 @@ int CameraStream::configure()\n \t\tif (ret)\n \t\t\treturn ret;\n \n+\t\tworker_ = std::make_unique<PostProcessorWorker>(postProcessor_.get());\n \t\tpostProcessor_->processComplete.connect(\n \t\t\tthis, [&](Camera3RequestDescriptor::StreamBuffer *streamBuffer,\n \t\t\t\t PostProcessor::Status status) {\n@@ -112,6 +113,8 @@ int CameraStream::configure()\n \t\t\t\tcameraDevice_->streamProcessingComplete(streamBuffer,\n \t\t\t\t\t\t\t\t\tbufferStatus);\n \t\t\t});\n+\n+\t\tworker_->start();\n \t}\n \n \tif (type_ == Type::Internal) {\n@@ -179,10 +182,6 @@ int CameraStream::process(const FrameBuffer &source,\n \n \tASSERT(type_ != Type::Direct);\n \n-\t/*\n-\t * \\todo Buffer mapping and processing should be moved to a\n-\t * separate thread.\n-\t */\n \tconst StreamConfiguration &output = configuration();\n \tdest.destBuffer = std::make_unique<CameraBuffer>(\n \t\t*dest.camera3Buffer, output.pixelFormat, output.size,\n@@ -194,11 +193,19 @@ int CameraStream::process(const FrameBuffer &source,\n \n \tdest.srcBuffer = &source;\n \n-\tpostProcessor_->process(&dest);\n+\tworker_->queueRequest(&dest);\n \n \treturn 0;\n }\n \n+void CameraStream::flush()\n+{\n+\tif (!postProcessor_)\n+\t\treturn;\n+\n+\tworker_->flush();\n+}\n+\n FrameBuffer *CameraStream::getBuffer()\n {\n \tif (!allocator_)\n@@ -226,3 +233,87 @@ void CameraStream::putBuffer(FrameBuffer *buffer)\n \n \tbuffers_.push_back(buffer);\n }\n+\n+CameraStream::PostProcessorWorker::PostProcessorWorker(PostProcessor *postProcessor)\n+\t: postProcessor_(postProcessor)\n+{\n+}\n+\n+CameraStream::PostProcessorWorker::~PostProcessorWorker()\n+{\n+\t{\n+\t\tlibcamera::MutexLocker lock(mutex_);\n+\t\tstate_ = State::Stopped;\n+\t}\n+\n+\tcv_.notify_one();\n+\twait();\n+}\n+\n+void CameraStream::PostProcessorWorker::start()\n+{\n+\t{\n+\t\tlibcamera::MutexLocker lock(mutex_);\n+\t\tASSERT(state_ != State::Running);\n+\t\tstate_ = State::Running;\n+\t}\n+\n+\tThread::start();\n+}\n+\n+void CameraStream::PostProcessorWorker::queueRequest(Camera3RequestDescriptor::StreamBuffer *dest)\n+{\n+\t{\n+\t\tMutexLocker lock(mutex_);\n+\t\tASSERT(state_ == State::Running);\n+\t\trequests_.push(dest);\n+\t}\n+\n+\tcv_.notify_one();\n+}\n+\n+void CameraStream::PostProcessorWorker::run()\n+{\n+\tMutexLocker locker(mutex_);\n+\n+\twhile (1) {\n+\t\tcv_.wait(locker, [&] {\n+\t\t\treturn state_ != State::Running || !requests_.empty();\n+\t\t});\n+\n+\t\tif (state_ != State::Running)\n+\t\t\tbreak;\n+\n+\t\tCamera3RequestDescriptor::StreamBuffer *streamBuffer = requests_.front();\n+\t\trequests_.pop();\n+\t\tlocker.unlock();\n+\n+\t\tpostProcessor_->process(streamBuffer);\n+\n+\t\tlocker.lock();\n+\t}\n+\n+\tif (state_ == State::Flushing) {\n+\t\tstd::queue<Camera3RequestDescriptor::StreamBuffer *> requests =\n+\t\t\tstd::move(requests_);\n+\t\tlocker.unlock();\n+\n+\t\twhile (!requests.empty()) {\n+\t\t\tpostProcessor_->processComplete.emit(\n+\t\t\t\trequests.front(), PostProcessor::Status::Error);\n+\t\t\trequests.pop();\n+\t\t}\n+\n+\t\tlocker.lock();\n+\t\tstate_ = State::Stopped;\n+\t}\n+}\n+\n+void CameraStream::PostProcessorWorker::flush()\n+{\n+\tlibcamera::MutexLocker lock(mutex_);\n+\tstate_ = State::Flushing;\n+\tlock.unlock();\n+\n+\tcv_.notify_one();\n+}\ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex e9c320b1..7c6e887c 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -7,12 +7,16 @@\n #ifndef __ANDROID_CAMERA_STREAM_H__\n #define __ANDROID_CAMERA_STREAM_H__\n \n+#include <condition_variable>\n #include <memory>\n #include <mutex>\n+#include <queue>\n #include <vector>\n \n #include <hardware/camera3.h>\n \n+#include <libcamera/base/thread.h>\n+\n #include <libcamera/camera.h>\n #include <libcamera/framebuffer.h>\n #include <libcamera/framebuffer_allocator.h>\n@@ -20,9 +24,9 @@\n #include <libcamera/pixel_format.h>\n \n #include \"camera_request.h\"\n+#include \"post_processor.h\"\n \n class CameraDevice;\n-class PostProcessor;\n \n class CameraStream\n {\n@@ -125,8 +129,38 @@ public:\n \t\t Camera3RequestDescriptor::StreamBuffer &dest);\n \tlibcamera::FrameBuffer *getBuffer();\n \tvoid putBuffer(libcamera::FrameBuffer *buffer);\n+\tvoid flush();\n \n private:\n+\tclass PostProcessorWorker : public libcamera::Thread\n+\t{\n+\tpublic:\n+\t\tenum class State {\n+\t\t\tStopped,\n+\t\t\tRunning,\n+\t\t\tFlushing,\n+\t\t};\n+\n+\t\tPostProcessorWorker(PostProcessor *postProcessor);\n+\t\t~PostProcessorWorker();\n+\n+\t\tvoid start();\n+\t\tvoid queueRequest(Camera3RequestDescriptor::StreamBuffer *request);\n+\t\tvoid flush();\n+\n+\tprotected:\n+\t\tvoid run() override;\n+\n+\tprivate:\n+\t\tPostProcessor *postProcessor_;\n+\n+\t\tlibcamera::Mutex mutex_;\n+\t\tstd::condition_variable cv_;\n+\n+\t\tstd::queue<Camera3RequestDescriptor::StreamBuffer *> requests_;\n+\t\tState state_ = State::Stopped;\n+\t};\n+\n \tint waitFence(int fence);\n \n \tCameraDevice *const cameraDevice_;\n@@ -143,6 +177,8 @@ private:\n \t */\n \tstd::unique_ptr<std::mutex> mutex_;\n \tstd::unique_ptr<PostProcessor> postProcessor_;\n+\n+\tstd::unique_ptr<PostProcessorWorker> worker_;\n };\n \n #endif /* __ANDROID_CAMERA_STREAM__ */\n", "prefixes": [ "libcamera-devel", "v6", "7/7" ] }