{"id":11179,"url":"https://patchwork.libcamera.org/api/1.1/patches/11179/?format=json","web_url":"https://patchwork.libcamera.org/patch/11179/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20210205204303.394105-1-niklas.soderlund@ragnatech.se>","date":"2021-02-05T20:43:03","name":"[libcamera-devel] libcamera: ipu3: Get request from information structure instead of buffer","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"ae3077daa11eb994f358c7ea3dca5b2a47adbf81","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11179/mbox/","series":[{"id":1659,"url":"https://patchwork.libcamera.org/api/1.1/series/1659/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1659","date":"2021-02-05T20:43:03","name":"[libcamera-devel] libcamera: ipu3: Get request from information structure instead of buffer","version":1,"mbox":"https://patchwork.libcamera.org/series/1659/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11179/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11179/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 17099BD162\n\tfor ;\n\tFri, 5 Feb 2021 20:43:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9A5B3614BC;\n\tFri, 5 Feb 2021 21:43:54 +0100 (CET)","from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0EE45614B0\n\tfor ;\n\tFri, 5 Feb 2021 21:43:52 +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 d8990e4f-67f2-11eb-b73f-0050569116f7;\n\tFri, 05 Feb 2021 21:43:51 +0100 (CET)"],"X-Halon-ID":"d8990e4f-67f2-11eb-b73f-0050569116f7","Authorized-sender":"niklas.soderlund@fsdn.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 5 Feb 2021 21:43:03 +0100","Message-Id":"<20210205204303.394105-1-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.30.0","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH] libcamera: ipu3: Get request from\n\tinformation structure instead of buffer","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=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Buffers dequeued from the ImgU may not be associated with a Request as\nthey are internal (statistics, parameters and some RAW buffers). Fetch\nthe request they are used for from the frame information instead.\n\nFixes: 9708f49fecf2f9ee (\"libcamera: ipu3: Share parameter and statistic buffers with IPA\")\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 16 ++++++++--------\n 1 file changed, 8 insertions(+), 8 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex c3763507c40a5d53..48f0a81f0634d424 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -1109,14 +1109,14 @@ void IPU3CameraData::queueFrameAction(unsigned int id,\n */\n void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n {\n-\tRequest *request = buffer->request();\n+\tIPU3Frames::Info *info = frameInfos_.find(buffer);\n+\tif (!info)\n+\t\treturn;\n+\n+\tRequest *request = info->request;\n \n \tpipe_->completeBuffer(request, buffer);\n \n-\tIPU3Frames::Info *info = frameInfos_.find(buffer);\n-\tif (!info)\n-\t\treturn;\n-\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@@ -1146,7 +1146,7 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n \tif (!info)\n \t\treturn;\n \n-\tRequest *request = buffer->request();\n+\tRequest *request = info->request;\n \n \t/* If the buffer is cancelled force a complete of the whole request. */\n \tif (buffer->metadata().status == FrameMetadata::FrameCancelled) {\n@@ -1175,7 +1175,7 @@ void IPU3CameraData::paramBufferReady(FrameBuffer *buffer)\n \n \tinfo->paramDequeued = true;\n \tif (frameInfos_.tryComplete(info))\n-\t\tpipe_->completeRequest(buffer->request());\n+\t\tpipe_->completeRequest(info->request);\n }\n \n void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n@@ -1187,7 +1187,7 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n \tif (buffer->metadata().status == FrameMetadata::FrameCancelled) {\n \t\tinfo->metadataProcessed = true;\n \t\tif (frameInfos_.tryComplete(info))\n-\t\t\tpipe_->completeRequest(buffer->request());\n+\t\t\tpipe_->completeRequest(info->request);\n \t\treturn;\n \t}\n \n","prefixes":["libcamera-devel"]}