{"id":23449,"url":"https://patchwork.libcamera.org/api/1.1/patches/23449/?format=json","web_url":"https://patchwork.libcamera.org/patch/23449/","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":"<20250526214224.13631-5-stefan.klug@ideasonboard.com>","date":"2025-05-26T21:42:18","name":"[RFC,4/4] pipeline: rkisp1: Prperly handle the bufferCount set in the stream configuration","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"e9aab0af0c1277e35e6ea0d2b58537142e87cc2d","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23449/mbox/","series":[{"id":5196,"url":"https://patchwork.libcamera.org/api/1.1/series/5196/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5196","date":"2025-05-26T21:42:14","name":"rkisp1: Allow usage of more than 4 buffers","version":1,"mbox":"https://patchwork.libcamera.org/series/5196/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23449/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23449/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 24E56C31E9\n\tfor ;\n\tMon, 26 May 2025 21:42:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BC76A68DA7;\n\tMon, 26 May 2025 23:42:51 +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 2071968DA9\n\tfor ;\n\tMon, 26 May 2025 23:42:49 +0200 (CEST)","from ideasonboard.com (tmo-070-11.customers.d1-online.com\n\t[80.187.70.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D5AEB7EA;\n\tMon, 26 May 2025 23:42:23 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"dIw8yPzU\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1748295744;\n\tbh=FBR0Gk1I7LLASvD4Vyhk0H7ZghPWgSqCcn/kb6bar9Q=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=dIw8yPzU9MQpZ2ioEHCPCF0rhCf6BTWFPPPe6lFKDttuP9/8AWWFYM5QF5JT64uR0\n\tzap6Ze4+mRzOZAMlgdjgJkZG/au2XJipxBeyrxIYL6IZ66qsHMGowhKGQmwnHYMeN+\n\tXnENSa7WIS0JH62xRJvmOy8lgD7PLo4daeiIoTJI=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[RFC PATCH 4/4] pipeline: rkisp1: Prperly handle the bufferCount set\n\tin the stream configuration","Date":"Mon, 26 May 2025 23:42:18 +0200","Message-ID":"<20250526214224.13631-5-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20250526214224.13631-1-stefan.klug@ideasonboard.com>","References":"<20250526214224.13631-1-stefan.klug@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":"The bufferCount is reset to a hardcoded value of 4 in RkISP1Path::validate().\nKeep the default value of 4 but do not reset it, if it was changed.\n\nSigned-off-by: Stefan Klug \n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 5 +++--\n src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 6 ++----\n src/libcamera/pipeline/rkisp1/rkisp1_path.h | 4 +---\n 3 files changed, 6 insertions(+), 9 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex af9117c83630..ea94bccd252d 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -791,6 +791,7 @@ PipelineHandlerRkISP1::generateConfiguration(Camera *camera,\n \t\t\treturn nullptr;\n \n \t\tcfg.colorSpace = colorSpace;\n+\t\tcfg.bufferCount = kPipelineDepth;\n \t\tconfig->addConfiguration(cfg);\n \t}\n \n@@ -1124,14 +1125,14 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlL\n \t}\n \n \tif (data->mainPath_->isEnabled()) {\n-\t\tret = mainPath_.start();\n+\t\tret = mainPath_.start(maxQueuedRequestsDevice());\n \t\tif (ret)\n \t\t\treturn ret;\n \t\tactions += [&]() { mainPath_.stop(); };\n \t}\n \n \tif (hasSelfPath_ && data->selfPath_->isEnabled()) {\n-\t\tret = selfPath_.start();\n+\t\tret = selfPath_.start(maxQueuedRequestsDevice());\n \t\tif (ret)\n \t\t\treturn ret;\n \t}\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\nindex 64018dc5b2f4..2f482fcc1834 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n@@ -249,7 +249,6 @@ RkISP1Path::generateConfiguration(const CameraSensor *sensor, const Size &size,\n \tStreamConfiguration cfg(formats);\n \tcfg.pixelFormat = format;\n \tcfg.size = streamSize;\n-\tcfg.bufferCount = RKISP1_BUFFER_COUNT;\n \n \treturn cfg;\n }\n@@ -383,7 +382,6 @@ RkISP1Path::validate(const CameraSensor *sensor,\n \n \tcfg->size.boundTo(maxResolution);\n \tcfg->size.expandTo(minResolution);\n-\tcfg->bufferCount = RKISP1_BUFFER_COUNT;\n \n \tV4L2DeviceFormat format;\n \tformat.fourcc = video_->toV4L2PixelFormat(cfg->pixelFormat);\n@@ -480,7 +478,7 @@ int RkISP1Path::configure(const StreamConfiguration &config,\n \treturn 0;\n }\n \n-int RkISP1Path::start()\n+int RkISP1Path::start(unsigned int bufferCount)\n {\n \tint ret;\n \n@@ -488,7 +486,7 @@ int RkISP1Path::start()\n \t\treturn -EBUSY;\n \n \t/* \\todo Make buffer count user configurable. */\n-\tret = video_->importBuffers(RKISP1_BUFFER_COUNT);\n+\tret = video_->importBuffers(bufferCount);\n \tif (ret)\n \t\treturn ret;\n \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h\nindex 430181d371a7..0b60c499ac64 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h\n@@ -58,7 +58,7 @@ public:\n \t\treturn video_->exportBuffers(bufferCount, buffers);\n \t}\n \n-\tint start();\n+\tint start(unsigned int bufferCount);\n \tvoid stop();\n \n \tint queueBuffer(FrameBuffer *buffer) { return video_->queueBuffer(buffer); }\n@@ -69,8 +69,6 @@ private:\n \tvoid populateFormats();\n \tSize filterSensorResolution(const CameraSensor *sensor);\n \n-\tstatic constexpr unsigned int RKISP1_BUFFER_COUNT = 4;\n-\n \tconst char *name_;\n \tbool running_;\n \n","prefixes":["RFC","4/4"]}