{"id":19478,"url":"https://patchwork.libcamera.org/api/1.1/patches/19478/?format=json","web_url":"https://patchwork.libcamera.org/patch/19478/","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":"<20240212153532.179283-2-dan.scally@ideasonboard.com>","date":"2024-02-12T15:35:28","name":"[1/5] libcamera: rkisp1: Make tryCompleteRequest() params agnostic","commit_ref":null,"pull_url":null,"state":"rejected","archived":true,"hash":"1fc4f56097c76ddebd3b09bc251fa61f8486573e","submitter":{"id":156,"url":"https://patchwork.libcamera.org/api/1.1/people/156/?format=json","name":"Dan Scally","email":"dan.scally@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19478/mbox/","series":[{"id":4166,"url":"https://patchwork.libcamera.org/api/1.1/series/4166/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4166","date":"2024-02-12T15:35:27","name":"Remove RkISP1FrameInfo class","version":1,"mbox":"https://patchwork.libcamera.org/series/4166/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19478/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19478/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 B38A5C3257\n\tfor ;\n\tMon, 12 Feb 2024 15:35:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B24E562808;\n\tMon, 12 Feb 2024 16:35:45 +0100 (CET)","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 B31A1627FE\n\tfor ;\n\tMon, 12 Feb 2024 16:35:43 +0100 (CET)","from mail.ideasonboard.com\n\t(cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id ED648B53;\n\tMon, 12 Feb 2024 16:35:41 +0100 (CET)"],"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=\"sSBdrBfQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1707752142;\n\tbh=DxJqQex+DsTsuM3bNz0S4N1NOuMFev5rQoljL/VGl8o=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=sSBdrBfQOfZh62TGh6e2BOok2XFKTvG84S0tnctUTA8J3+7mYh41JhEogYFS1ayzM\n\tQLJtMCybi4g0qQsob/3paXMKVNRaO76pzaeuK77v44ZDf6xoTVD0tbEEVvdQh/Wyuh\n\te8JGTCXxVJnUkVAsDMcbltpyZpp1ve2vbgvQUnJ4=","From":"Daniel Scally ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH 1/5] libcamera: rkisp1: Make tryCompleteRequest() params\n\tagnostic","Date":"Mon, 12 Feb 2024 15:35:28 +0000","Message-Id":"<20240212153532.179283-2-dan.scally@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20240212153532.179283-1-dan.scally@ideasonboard.com>","References":"<20240212153532.179283-1-dan.scally@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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":"tryCompleteRequest() doesn't actually need to know the status of the\nparameters buffer to decide whether it's ok to complete the Request\nor not - remove the check. Since setting the paramsDequeued flag is\nall that the paramsReady slot actually does, that can be removed too.\n\nSigned-off-by: Daniel Scally \n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 20 --------------------\n 1 file changed, 20 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 586b46d6..5460dc11 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -60,7 +60,6 @@ struct RkISP1FrameInfo {\n \tFrameBuffer *mainPathBuffer;\n \tFrameBuffer *selfPathBuffer;\n \n-\tbool paramDequeued;\n \tbool metadataProcessed;\n };\n \n@@ -177,7 +176,6 @@ private:\n \tint createCamera(MediaEntity *sensor);\n \tvoid tryCompleteRequest(RkISP1FrameInfo *info);\n \tvoid bufferReady(FrameBuffer *buffer);\n-\tvoid paramReady(FrameBuffer *buffer);\n \tvoid statReady(FrameBuffer *buffer);\n \tvoid frameStart(uint32_t sequence);\n \n@@ -248,7 +246,6 @@ RkISP1FrameInfo *RkISP1Frames::create(const RkISP1CameraData *data, Request *req\n \tinfo->mainPathBuffer = mainPathBuffer;\n \tinfo->selfPathBuffer = selfPathBuffer;\n \tinfo->statBuffer = statBuffer;\n-\tinfo->paramDequeued = false;\n \tinfo->metadataProcessed = false;\n \n \tframeInfo_[frame] = info;\n@@ -1213,7 +1210,6 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \tif (hasSelfPath_)\n \t\tselfPath_.bufferReady().connect(this, &PipelineHandlerRkISP1::bufferReady);\n \tstat_->bufferReady.connect(this, &PipelineHandlerRkISP1::statReady);\n-\tparam_->bufferReady.connect(this, &PipelineHandlerRkISP1::paramReady);\n \n \t/*\n \t * Enumerate all sensors connected to the ISP and create one\n@@ -1243,9 +1239,6 @@ void PipelineHandlerRkISP1::tryCompleteRequest(RkISP1FrameInfo *info)\n \tif (!info->metadataProcessed)\n \t\treturn;\n \n-\tif (!isRaw_ && !info->paramDequeued)\n-\t\treturn;\n-\n \tdata->frameInfo_.destroy(info->frame);\n \n \tcompleteRequest(request);\n@@ -1287,19 +1280,6 @@ void PipelineHandlerRkISP1::bufferReady(FrameBuffer *buffer)\n \ttryCompleteRequest(info);\n }\n \n-void PipelineHandlerRkISP1::paramReady(FrameBuffer *buffer)\n-{\n-\tASSERT(activeCamera_);\n-\tRkISP1CameraData *data = cameraData(activeCamera_);\n-\n-\tRkISP1FrameInfo *info = data->frameInfo_.find(buffer);\n-\tif (!info)\n-\t\treturn;\n-\n-\tinfo->paramDequeued = true;\n-\ttryCompleteRequest(info);\n-}\n-\n void PipelineHandlerRkISP1::statReady(FrameBuffer *buffer)\n {\n \tASSERT(activeCamera_);\n","prefixes":["1/5"]}