Patch Detail
Show a patch.
GET /api/patches/11161/?format=api
{ "id": 11161, "url": "https://patchwork.libcamera.org/api/patches/11161/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11161/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20210204162943.268517-12-niklas.soderlund@ragnatech.se>", "date": "2021-02-04T16:29:43", "name": "[libcamera-devel,v3,11/11] libcamera: ipu3: Share parameter and statistic buffers with IPA", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "14007c48be0d2202d0f327e38e3241b9631d816a", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/11161/mbox/", "series": [ { "id": 1655, "url": "https://patchwork.libcamera.org/api/series/1655/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1655", "date": "2021-02-04T16:29:32", "name": "libcamera: ipu3: Attach to an skeleton IPA", "version": 3, "mbox": "https://patchwork.libcamera.org/series/1655/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11161/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11161/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 BC21DBD163\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 4 Feb 2021 16:30:17 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8959E6146C;\n\tThu, 4 Feb 2021 17:30:17 +0100 (CET)", "from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E624D61450\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 4 Feb 2021 17:30:15 +0100 (CET)", "from bismarck.berto.se (p4fca2458.dip0.t-ipconnect.de\n\t[79.202.36.88])\n\tby bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 426c6940-6706-11eb-b73f-0050569116f7;\n\tThu, 04 Feb 2021 17:30:14 +0100 (CET)" ], "X-Halon-ID": "426c6940-6706-11eb-b73f-0050569116f7", "Authorized-sender": "niklas.soderlund@fsdn.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 4 Feb 2021 17:29:43 +0100", "Message-Id": "<20210204162943.268517-12-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.30.0", "In-Reply-To": "<20210204162943.268517-1-niklas.soderlund@ragnatech.se>", "References": "<20210204162943.268517-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v3 11/11] libcamera: ipu3: Share parameter\n\tand statistic buffers with IPA", "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>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Use the IPU3Frames helper to share parameters and statistics buffers\nwith the IPA. Track which parameter and statistic buffer is used for\nwhich request and make sure the parameter buffers is filled in by the\nIPA before it's needed and that the statistic buffer is consumed and\nmeta data generated before completing the request.\n\nWith this change the IPU3 pipeline is prepared to fully operate with an\nIPA component.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n* Changes since v1\n- Update commit message.\n- s/frameInfo_/frameInfos_/\n- Refactor away isComplete variable.\n\n* Changes since v2\n- Emedd the IPU3Frames instance instead of allocating it.\n- Use -ENOBUFS instead of _ENOENT in queueRequestDevice().\n- Keep isComplete in cio2BufferReady()\n- Rework the queue logic.\n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 149 ++++++++++++++++++++-------\n 1 file changed, 112 insertions(+), 37 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 092db6389833a481..b79db25050d2c1d6 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -29,6 +29,7 @@\n #include \"libcamera/internal/v4l2_controls.h\"\n \n #include \"cio2.h\"\n+#include \"frames.h\"\n #include \"imgu.h\"\n \n namespace libcamera {\n@@ -61,6 +62,8 @@ public:\n \n \tvoid imguOutputBufferReady(FrameBuffer *buffer);\n \tvoid cio2BufferReady(FrameBuffer *buffer);\n+\tvoid paramBufferReady(FrameBuffer *buffer);\n+\tvoid statBufferReady(FrameBuffer *buffer);\n \n \tCIO2Device cio2_;\n \tImgUDevice *imgu_;\n@@ -71,6 +74,7 @@ public:\n \n \tuint32_t exposureTime_;\n \tstd::unique_ptr<DelayedControls> delayedCtrls_;\n+\tIPU3Frames frameInfos_;\n \n private:\n \tvoid queueFrameAction(unsigned int id, const IPAOperationData &op);\n@@ -609,6 +613,8 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera)\n \n \tdata->ipa_->mapBuffers(ipaBuffers_);\n \n+\tdata->frameInfos_.init(imgu->paramBuffers_, imgu->statBuffers_);\n+\n \treturn 0;\n }\n \n@@ -616,6 +622,8 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera)\n {\n \tIPU3CameraData *data = cameraData(camera);\n \n+\tdata->frameInfos_.clear();\n+\n \tstd::vector<unsigned int> ids;\n \tfor (IPABuffer &ipabuf : ipaBuffers_)\n \t\tids.push_back(ipabuf.id);\n@@ -713,7 +721,10 @@ void PipelineHandlerIPU3::stop(Camera *camera)\n int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)\n {\n \tIPU3CameraData *data = cameraData(camera);\n-\tint error = 0;\n+\n+\tIPU3Frames::Info *info = data->frameInfos_.create(request);\n+\tif (!info)\n+\t\treturn -ENOBUFS;\n \n \t/*\n \t * Queue a buffer on the CIO2, using the raw stream buffer provided in\n@@ -724,24 +735,9 @@ int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)\n \tif (!rawBuffer)\n \t\treturn -ENOMEM;\n \n-\t/* Queue all buffers from the request aimed for the ImgU. */\n-\tfor (auto it : request->buffers()) {\n-\t\tconst Stream *stream = it.first;\n-\t\tFrameBuffer *buffer = it.second;\n-\t\tint ret;\n+\tinfo->rawBuffer = rawBuffer;\n \n-\t\tif (stream == &data->outStream_)\n-\t\t\tret = data->imgu_->output_->queueBuffer(buffer);\n-\t\telse if (stream == &data->vfStream_)\n-\t\t\tret = data->imgu_->viewfinder_->queueBuffer(buffer);\n-\t\telse\n-\t\t\tcontinue;\n-\n-\t\tif (ret < 0)\n-\t\t\terror = ret;\n-\t}\n-\n-\treturn error;\n+\treturn 0;\n }\n \n bool PipelineHandlerIPU3::match(DeviceEnumerator *enumerator)\n@@ -1007,6 +1003,10 @@ int PipelineHandlerIPU3::registerCameras()\n \t\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n \t\tdata->imgu_->viewfinder_->bufferReady.connect(data.get(),\n \t\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n+\t\tdata->imgu_->param_->bufferReady.connect(data.get(),\n+\t\t\t\t\t&IPU3CameraData::paramBufferReady);\n+\t\tdata->imgu_->stat_->bufferReady.connect(data.get(),\n+\t\t\t\t\t&IPU3CameraData::statBufferReady);\n \n \t\t/* Create and register the Camera instance. */\n \t\tstd::string cameraId = cio2->sensor()->id();\n@@ -1039,7 +1039,7 @@ int IPU3CameraData::loadIPA()\n \treturn 0;\n }\n \n-void IPU3CameraData::queueFrameAction([[maybe_unused]] unsigned int id,\n+void IPU3CameraData::queueFrameAction(unsigned int id,\n \t\t\t\t const IPAOperationData &action)\n {\n \tswitch (action.operation) {\n@@ -1048,6 +1048,41 @@ void IPU3CameraData::queueFrameAction([[maybe_unused]] unsigned int id,\n \t\tdelayedCtrls_->push(controls);\n \t\tbreak;\n \t}\n+\tcase IPU3_IPA_ACTION_PARAM_FILLED: {\n+\t\tIPU3Frames::Info *info = frameInfos_.find(id);\n+\t\tif (!info)\n+\t\t\tbreak;\n+\n+\t\t/* Queue all buffers from the request aimed for the ImgU. */\n+\t\tfor (auto it : info->request->buffers()) {\n+\t\t\tconst Stream *stream = it.first;\n+\t\t\tFrameBuffer *outbuffer = it.second;\n+\n+\t\t\tif (stream == &outStream_)\n+\t\t\t\timgu_->output_->queueBuffer(outbuffer);\n+\t\t\telse if (stream == &vfStream_)\n+\t\t\t\timgu_->viewfinder_->queueBuffer(outbuffer);\n+\t\t}\n+\n+\t\timgu_->param_->queueBuffer(info->paramBuffer);\n+\t\timgu_->stat_->queueBuffer(info->statBuffer);\n+\t\timgu_->input_->queueBuffer(info->rawBuffer);\n+\n+\t\tbreak;\n+\t}\n+\tcase IPU3_IPA_ACTION_METADATA_READY: {\n+\t\tIPU3Frames::Info *info = frameInfos_.find(id);\n+\t\tif (!info)\n+\t\t\tbreak;\n+\n+\t\tRequest *request = info->request;\n+\t\trequest->metadata() = action.controls[0];\n+\t\tinfo->metadataProcessed = true;\n+\t\tif (frameInfos_.tryComplete(info))\n+\t\t\tpipe_->completeRequest(request);\n+\n+\t\tbreak;\n+\t}\n \tdefault:\n \t\tLOG(IPU3, Error) << \"Unknown action \" << action.operation;\n \t\tbreak;\n@@ -1068,11 +1103,12 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n {\n \tRequest *request = buffer->request();\n \n-\tif (!pipe_->completeBuffer(request, buffer))\n-\t\t/* Request not completed yet, return here. */\n+\tpipe_->completeBuffer(request, buffer);\n+\n+\tIPU3Frames::Info *info = frameInfos_.find(buffer);\n+\tif (!info)\n \t\treturn;\n \n-\t/* Mark the request as complete. */\n \trequest->metadata().set(controls::draft::PipelineDepth, 3);\n \t/* \\todo Move the ExposureTime control to the IPA. */\n \trequest->metadata().set(controls::ExposureTime, exposureTime_);\n@@ -1081,7 +1117,12 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n \t\tRectangle cropRegion = request->controls().get(controls::ScalerCrop);\n \t\trequest->metadata().set(controls::ScalerCrop, cropRegion);\n \t}\n-\tpipe_->completeRequest(request);\n+\n+\tif (buffer->metadata().status == FrameMetadata::FrameCancelled)\n+\t\tinfo->metadataProcessed = true;\n+\n+\tif (frameInfos_.tryComplete(info))\n+\t\tpipe_->completeRequest(request);\n }\n \n /**\n@@ -1093,26 +1134,60 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n */\n void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n {\n-\t/* \\todo Handle buffer failures when state is set to BufferError. */\n-\tif (buffer->metadata().status == FrameMetadata::FrameCancelled)\n+\tIPU3Frames::Info *info = frameInfos_.find(buffer);\n+\tif (!info)\n \t\treturn;\n \n \tRequest *request = buffer->request();\n \n-\t/*\n-\t * If the request contains a buffer for the RAW stream only, complete it\n-\t * now as there's no need for ImgU processing.\n-\t */\n-\tif (request->findBuffer(&rawStream_)) {\n-\t\tbool isComplete = pipe_->completeBuffer(request, buffer);\n-\t\tif (isComplete) {\n-\t\t\trequest->metadata().set(controls::draft::PipelineDepth, 2);\n-\t\t\tpipe_->completeRequest(request);\n-\t\t\treturn;\n-\t\t}\n+\tif (request->findBuffer(&rawStream_))\n+\t\tpipe_->completeBuffer(request, buffer);\n+\n+\t/* If the buffer is cancelled force a complete of the whole request. */\n+\tif (buffer->metadata().status == FrameMetadata::FrameCancelled) {\n+\t\tfor (auto it : request->buffers())\n+\t\t\tif (it.second != buffer)\n+\t\t\t\tpipe_->completeBuffer(request, it.second);\n+\n+\t\tinfo->paramDequeued = true;\n+\t\tinfo->metadataProcessed = true;\n+\t\tASSERT(frameInfos_.tryComplete(info));\n+\t\tpipe_->completeRequest(request);\n+\n+\t\treturn;\n \t}\n \n-\timgu_->input_->queueBuffer(buffer);\n+\tIPAOperationData op;\n+\top.operation = IPU3_IPA_EVENT_FILL_PARAMS;\n+\top.data = { info->id, info->paramBuffer->cookie() };\n+\top.controls = { request->controls() };\n+\tipa_->processEvent(op);\n+}\n+\n+void IPU3CameraData::paramBufferReady(FrameBuffer *buffer)\n+{\n+\tIPU3Frames::Info *info = frameInfos_.find(buffer);\n+\tif (!info)\n+\t\treturn;\n+\n+\tinfo->paramDequeued = true;\n+\tif (frameInfos_.tryComplete(info))\n+\t\tpipe_->completeRequest(buffer->request());\n+}\n+\n+void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n+{\n+\tif (buffer->metadata().status == FrameMetadata::FrameCancelled)\n+\t\treturn;\n+\n+\tIPU3Frames::Info *info = frameInfos_.find(buffer);\n+\tif (!info)\n+\t\treturn;\n+\n+\tIPAOperationData op;\n+\top.operation = IPU3_IPA_EVENT_STAT_READY;\n+\top.data = { info->id, info->statBuffer->cookie() };\n+\tipa_->processEvent(op);\n }\n \n REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3)\n", "prefixes": [ "libcamera-devel", "v3", "11/11" ] }