{"id":21718,"url":"https://patchwork.libcamera.org/api/patches/21718/?format=json","web_url":"https://patchwork.libcamera.org/patch/21718/","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":"<20241021133718.894374-3-mzamazal@redhat.com>","date":"2024-10-21T13:37:17","name":"[v5,2/3] libcamera: simple: Track requests in conversionQueue_","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"77d2bb8a25057192ab4d91b8dff583d5a988d260","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21718/mbox/","series":[{"id":4731,"url":"https://patchwork.libcamera.org/api/series/4731/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4731","date":"2024-10-21T13:37:15","name":"Clean up pending requests on stop in software ISP","version":5,"mbox":"https://patchwork.libcamera.org/series/4731/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21718/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21718/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 8B9C7C3309\n\tfor ;\n\tMon, 21 Oct 2024 13:37:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E596E65399;\n\tMon, 21 Oct 2024 15:37:49 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6CCD765398\n\tfor ;\n\tMon, 21 Oct 2024 15:37:47 +0200 (CEST)","from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-427--zghdlq9P0-e4RW-PQmOcA-1;\n\tMon, 21 Oct 2024 09:37:42 -0400","from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.40])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 6AE401955F43; Mon, 21 Oct 2024 13:37:41 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.225.218])\n\tby mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 4AB6819560AA; Mon, 21 Oct 2024 13:37:38 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"VNoeK+D/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1729517866;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=/KjUV+jV2J4k0c6iGkRURF6qQjdQhvNIhS+4USjZRPw=;\n\tb=VNoeK+D/LsByMuNH5NsW+A8jfBJA9cXt577JU6Wyhh/xg6MOPrpcc7BoWKK62gd5j9jgkd\n\ti5HLe5ydaHauLrW3dwvAZP4NOo5abi6nXqlny2f/bQmK498iX+WMDSlTSOkxVXb5bdC98n\n\thOazuEVnFpQ0l6l2tXMUFQdHu1OVRiU=","X-MC-Unique":"-zghdlq9P0-e4RW-PQmOcA-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal , robert.mader@posteo.de,\n\tkieran.bingham@ideasonboard.com, laurent.pinchart@ideasonboard.com","Subject":"[PATCH v5 2/3] libcamera: simple: Track requests in conversionQueue_","Date":"Mon, 21 Oct 2024 15:37:17 +0200","Message-ID":"<20241021133718.894374-3-mzamazal@redhat.com>","In-Reply-To":"<20241021133718.894374-1-mzamazal@redhat.com>","References":"<20241021133718.894374-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.40","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","Content-Type":"text/plain; charset=\"US-ASCII\"; x-default=true","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Simple pipeline retrieves the requests to complete from the\nconversionQueue_. This patch stores the requests in conversionQueue_\nexplicitly. This explicit tracking is supposed to be preferred to\nimplicit retrieval and it simplifies the completion code a bit here and\nin the followup patch that adds request cleanup on stop.\n\nThe change as implemented assumes that all the buffers in each of the\nconversionQueue_ elements point to the same request, the one specified.\n\nSigned-off-by: Milan Zamazal \nTested-by: Kieran Bingham \nReviewed-by: Kieran Bingham \n---\n src/libcamera/pipeline/simple/simple.cpp | 26 ++++++++++++------------\n 1 file changed, 13 insertions(+), 13 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 3ddce71d3..f3a6b1635 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -282,7 +282,11 @@ public:\n \tstd::unique_ptr delayedCtrls_;\n \n \tstd::vector> conversionBuffers_;\n-\tstd::queue> conversionQueue_;\n+\tstruct RequestOutputs {\n+\t\tRequest *request;\n+\t\tstd::map outputs;\n+\t};\n+\tstd::queue conversionQueue_;\n \tbool useConversion_;\n \n \tstd::unique_ptr converter_;\n@@ -813,16 +817,12 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer)\n \t\tif (conversionQueue_.empty())\n \t\t\treturn;\n \n-\t\tRequest *request = nullptr;\n-\t\tfor (auto &item : conversionQueue_.front()) {\n-\t\t\tFrameBuffer *outputBuffer = item.second;\n-\t\t\trequest = outputBuffer->request();\n-\t\t\tpipe->completeBuffer(request, outputBuffer);\n-\t\t}\n+\t\tRequest *request = conversionQueue_.front().request;\n+\t\tfor (auto &item : conversionQueue_.front().outputs)\n+\t\t\tpipe->completeBuffer(request, item.second);\n+\t\tpipe->completeRequest(request);\n \t\tconversionQueue_.pop();\n \n-\t\tif (request)\n-\t\t\tpipe->completeRequest(request);\n \t\treturn;\n \t}\n \n@@ -838,7 +838,7 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer)\n \n \tif (useConversion_ && !conversionQueue_.empty()) {\n \t\tconst std::map &outputs =\n-\t\t\tconversionQueue_.front();\n+\t\t\tconversionQueue_.front().outputs;\n \t\tif (!outputs.empty()) {\n \t\t\tFrameBuffer *outputBuffer = outputs.begin()->second;\n \t\t\tif (outputBuffer)\n@@ -862,7 +862,7 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer)\n \t\t}\n \n \t\tif (converter_)\n-\t\t\tconverter_->queueBuffers(buffer, conversionQueue_.front());\n+\t\t\tconverter_->queueBuffers(buffer, conversionQueue_.front().outputs);\n \t\telse\n \t\t\t/*\n \t\t\t * request->sequence() cannot be retrieved from `buffer' inside\n@@ -870,7 +870,7 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer)\n \t\t\t * already here.\n \t\t\t */\n \t\t\tswIsp_->queueBuffers(request->sequence(), buffer,\n-\t\t\t\t\t conversionQueue_.front());\n+\t\t\t\t\t conversionQueue_.front().outputs);\n \n \t\tconversionQueue_.pop();\n \t\treturn;\n@@ -1434,7 +1434,7 @@ int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)\n \t}\n \n \tif (data->useConversion_) {\n-\t\tdata->conversionQueue_.push(std::move(buffers));\n+\t\tdata->conversionQueue_.push({ .request = request, .outputs = std::move(buffers) });\n \t\tif (data->swIsp_)\n \t\t\tdata->swIsp_->queueRequest(request->sequence(), request->controls());\n \t}\n","prefixes":["v5","2/3"]}