[{"id":36715,"web_url":"https://patchwork.libcamera.org/comment/36715/","msgid":"<176236123805.2116251.10272682534873095289@neptunite.rasen.tech>","date":"2025-11-05T16:47:18","subject":"Re: [PATCH v2 14/35] libcamera: rkisp1: Move useDewarper_ flag into\n\tRkISP1CameraData","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Quoting Stefan Klug (2025-10-23 23:48:15)\n> The decision if the dewarper shall be used is not per pipeline but per\n> camera and per configuration (raw streams can't use it). Move the\n> corresponding flag into the camera data class. Rename the flag to\n> \"usesDewarper\" which is easier understand when we later add the ability\n> to enable/disable the dewarper on a per camera basis which will be\n> expressed using a \"canUseDewarper\" flag.\n> \n> Signed-off-by: Stefan Klug \n\nLooks good to me.\n\nReviewed-by: Paul Elder \n\n> ---\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 28 ++++++++++++------------\n> 1 file changed, 14 insertions(+), 14 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 05409bc46ee3..241c83f4125b 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -123,6 +123,8 @@ public:\n> */\n> MediaPipeline pipe_;\n> \n> + bool usesDewarper_;\n> +\n> private:\n> void paramsComputed(unsigned int frame, unsigned int bytesused);\n> void setSensorControls(unsigned int frame,\n> @@ -234,7 +236,6 @@ private:\n> \n> std::unique_ptr dewarper_;\n> Rectangle scalerMaxCrop_;\n> - bool useDewarper_;\n> \n> std::optional activeCrop_;\n> \n> @@ -285,7 +286,7 @@ RkISP1FrameInfo *RkISP1Frames::create(const RkISP1CameraData *data, Request *req\n> statBuffer = pipe_->availableStatBuffers_.front();\n> pipe_->availableStatBuffers_.pop();\n> \n> - if (pipe_->useDewarper_) {\n> + if (data->usesDewarper_) {\n> mainPathBuffer = pipe_->availableMainPathBuffers_.front();\n> pipe_->availableMainPathBuffers_.pop();\n> }\n> @@ -715,8 +716,7 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n> */\n> \n> PipelineHandlerRkISP1::PipelineHandlerRkISP1(CameraManager *manager)\n> - : PipelineHandler(manager, kRkISP1MaxQueuedRequests),\n> - hasSelfPath_(true), useDewarper_(false)\n> + : PipelineHandler(manager, kRkISP1MaxQueuedRequests), hasSelfPath_(true)\n> {\n> }\n> \n> @@ -879,7 +879,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n> const PixelFormat &streamFormat = config->at(0).pixelFormat;\n> const PixelFormatInfo &info = PixelFormatInfo::info(streamFormat);\n> isRaw_ = info.colourEncoding == PixelFormatInfo::ColourEncodingRAW;\n> - useDewarper_ = dewarper_ && !isRaw_;\n> + data->usesDewarper_ = dewarper_ && !isRaw_;\n> \n> /* YUYV8_2X8 is required on the ISP source path pad for YUV output. */\n> if (!isRaw_)\n> @@ -893,7 +893,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n> /* imx8mp has only a single path. */\n> const auto &cfg = config->at(0);\n> Size ispCrop = format.size.boundedToAspectRatio(cfg.size);\n> - if (useDewarper_)\n> + if (data->usesDewarper_)\n> ispCrop = dewarper_->adjustInputSize(cfg.pixelFormat,\n> ispCrop);\n> else\n> @@ -934,7 +934,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n> streamConfig[0] = IPAStream(cfg.pixelFormat,\n> cfg.size);\n> /* Configure dewarp */\n> - if (dewarper_ && !isRaw_) {\n> + if (data->usesDewarper_) {\n> outputCfgs.push_back(const_cast(cfg));\n> ret = dewarper_->configure(cfg, outputCfgs);\n> if (ret)\n> @@ -999,7 +999,7 @@ int PipelineHandlerRkISP1::exportFrameBuffers([[maybe_unused]] Camera *camera, S\n> * It has mainpath and no self path. Hence, export buffers from\n> * dewarper just for the main path stream, for now.\n> */\n> - if (useDewarper_)\n> + if (data->usesDewarper_)\n> return dewarper_->exportBuffers(&data->mainPathStream_, count, buffers);\n> else\n> return mainPath_.exportBuffers(count, buffers);\n> @@ -1033,7 +1033,7 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)\n> }\n> \n> /* If the dewarper is being used, allocate internal buffers for ISP. */\n> - if (useDewarper_) {\n> + if (data->usesDewarper_) {\n> ret = mainPath_.exportBuffers(kRkISP1MinBufferCount, &mainPathBuffers_);\n> if (ret < 0)\n> return ret;\n> @@ -1153,7 +1153,7 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlL\n> }\n> actions += [&]() { stat_->streamOff(); };\n> \n> - if (useDewarper_) {\n> + if (data->usesDewarper_) {\n> ret = dewarper_->start();\n> if (ret) {\n> LOG(RkISP1, Error) << \"Failed to start dewarper\";\n> @@ -1208,7 +1208,7 @@ void PipelineHandlerRkISP1::stopDevice(Camera *camera)\n> LOG(RkISP1, Warning)\n> << \"Failed to stop parameters for \" << camera->id();\n> \n> - if (useDewarper_)\n> + if (data->usesDewarper_)\n> dewarper_->stop();\n> }\n> \n> @@ -1304,7 +1304,7 @@ int PipelineHandlerRkISP1::updateControls(RkISP1CameraData *data)\n> {\n> ControlInfoMap::Map controls;\n> \n> - if (dewarper_) {\n> + if (data->usesDewarper_) {\n> std::pair cropLimits;\n> if (dewarper_->isConfigured(&data->mainPathStream_))\n> cropLimits = dewarper_->inputCropBounds(&data->mainPathStream_);\n> @@ -1474,7 +1474,7 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n> this, &PipelineHandlerRkISP1::dewarpBufferReady);\n> \n> LOG(RkISP1, Info)\n> - << \"Using DW100 dewarper \" << dewarper_->deviceNode();\n> + << \"Found DW100 dewarper \" << dewarper_->deviceNode();\n> } else {\n> LOG(RkISP1, Warning)\n> << \"Found DW100 dewarper \" << dewarper_->deviceNode()\n> @@ -1579,7 +1579,7 @@ void PipelineHandlerRkISP1::imageBufferReady(FrameBuffer *buffer)\n> info->metadataProcessed = true;\n> }\n> \n> - if (!useDewarper_) {\n> + if (!data->usesDewarper_) {\n> completeBuffer(request, buffer);\n> tryCompleteRequest(info);\n> \n> -- \n> 2.48.1\n>","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 D69B4C3241\n\tfor ;\n\tWed, 5 Nov 2025 16:47:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 724A860AA8;\n\tWed, 5 Nov 2025 17:47:25 +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 8A7E360805\n\tfor ;\n\tWed, 5 Nov 2025 17:47:24 +0100 (CET)","from neptunite.rasen.tech (unknown\n\t[IPv6:2404:7a81:160:2100:d4d0:27ea:7a74:8a9e])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id ADEFE13D9; \n\tWed, 5 Nov 2025 17:45:29 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"CciITnfQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1762361130;\n\tbh=+pc0gInZ7JBs4jUI85jYx4WFXtvQQeXVE9UjtqZHdKM=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=CciITnfQeu6ACYAh1r4M+yvmkt+rEayDo7xNC9fEnhmFF6amuoiJwrMKS3E/wgnHr\n\tRUedkATXyFuO12jOexbkGnLYM42sK93BI1NhPTFL6qRCIaqbvqOeYTYHTsrO9OHszv\n\tsORPPDIWsNCoPmY1GgJOGyeTQATDrqp91QO7T1x0=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20251023144841.403689-15-stefan.klug@ideasonboard.com>","References":"<20251023144841.403689-1-stefan.klug@ideasonboard.com>\n\t<20251023144841.403689-15-stefan.klug@ideasonboard.com>","Subject":"Re: [PATCH v2 14/35] libcamera: rkisp1: Move useDewarper_ flag into\n\tRkISP1CameraData","From":"Paul Elder ","Cc":"Stefan Klug ","To":"Stefan Klug ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Thu, 06 Nov 2025 01:47:18 +0900","Message-ID":"<176236123805.2116251.10272682534873095289@neptunite.rasen.tech>","User-Agent":"alot/0.0.0","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\" "}}]