[{"id":33179,"web_url":"https://patchwork.libcamera.org/comment/33179/","msgid":"<20250126213004.GC1133@pendragon.ideasonboard.com>","date":"2025-01-26T21:30:04","subject":"Re: [RFC PATCH v2 04/13] libcamera: simple: Add plain output\n\tconfigurations to software ISP","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Milan,\n\nThank you for the patch.\n\nOn Fri, Jan 24, 2025 at 10:57:55PM +0100, Milan Zamazal wrote:\n> When software ISP is active, only software ISP adjusted output\n> configurations are considered. We want to support raw streams together\n> with software ISP and for that purpose, we need to track also unmodified\n> configurations.\n> \n> A flag is added to SimpleCameraData::Configuration indicating whether\n> it's for software ISP. Configurations for unmodified output sizes and\n> formats are added now whether software ISP is active or not. We later\n> filter formats and output sizes for particular stream configuration\n> according to the new configuration flag. This is just preparation and\n> raw output is still not supported; for this reason, we just look whether\n> software ISP is active; this will be changed in followup patches.\n> \n> Signed-off-by: Milan Zamazal \n> ---\n> src/libcamera/pipeline/simple/simple.cpp | 30 ++++++++++++++----------\n> 1 file changed, 18 insertions(+), 12 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> index 06df909b..71853bb2 100644\n> --- a/src/libcamera/pipeline/simple/simple.cpp\n> +++ b/src/libcamera/pipeline/simple/simple.cpp\n> @@ -273,6 +273,7 @@ public:\n> \t\tSize captureSize;\n> \t\tstd::vector outputFormats;\n> \t\tSizeRange outputSizes;\n> +\t\tbool swisp;\n> \t};\n> \n> \tstd::vector streams_;\n> @@ -654,19 +655,24 @@ void SimpleCameraData::tryPipeline(unsigned int code, const Size &size)\n> \t\tconfig.sensorSize = size;\n> \t\tconfig.captureFormat = pixelFormat;\n> \t\tconfig.captureSize = format.size;\n> +\t\tconfig.swisp = false;\n> \n> \t\tif (converter_) {\n> \t\t\tconfig.outputFormats = converter_->formats(pixelFormat);\n> \t\t\tconfig.outputSizes = converter_->sizes(format.size);\n> -\t\t} else if (swIsp_) {\n> -\t\t\tconfig.outputFormats = swIsp_->formats(pixelFormat);\n> -\t\t\tconfig.outputSizes = swIsp_->sizes(pixelFormat, format.size);\n> -\t\t\tif (config.outputFormats.empty()) {\n> -\t\t\t\t/* Do not use swIsp for unsupported pixelFormat's. */\n> -\t\t\t\tconfig.outputFormats = { pixelFormat };\n> -\t\t\t\tconfig.outputSizes = config.captureSize;\n> -\t\t\t}\n> \t\t} else {\n> +\t\t\tif (swIsp_) {\n> +\t\t\t\tConfiguration swispConfig = config;\n> +\t\t\t\tswispConfig.outputFormats = swIsp_->formats(pixelFormat);\n> +\t\t\t\tswispConfig.outputSizes = swIsp_->sizes(pixelFormat, format.size);\n> +\t\t\t\tif (swispConfig.outputFormats.empty()) {\n> +\t\t\t\t\t/* Do not use swIsp for unsupported pixelFormat's. */\n> +\t\t\t\t\tswispConfig.outputFormats = { pixelFormat };\n> +\t\t\t\t\tswispConfig.outputSizes = swispConfig.captureSize;\n> +\t\t\t\t}\n> +\t\t\t\tswispConfig.swisp = true;\n> +\t\t\t\tconfigs_.push_back(swispConfig);\n> +\t\t\t}\n\nThat's really getting too confusing. I've read the rest of the series,\nand it doesn't get better :-(\n\nI think we need to first refactor the existing code to make raw handling\nidentifical for the converter and software ISP cases. It doesn't mean\nyou have to create a common interface for the two elements (it would\nbe nice, but it's more yak shaving than I could reasonably ask for).\n\n> \t\t\tconfig.outputFormats = { pixelFormat };\n> \t\t\tconfig.outputSizes = config.captureSize;\n> \t\t}\n> @@ -1185,10 +1191,10 @@ SimplePipelineHandler::generateConfiguration(Camera *camera, Span \t/* Create the formats map. */\n> \tstd::map> formats;\n> \n> -\tfor (const SimpleCameraData::Configuration &cfg : data->configs_) {\n> -\t\tfor (PixelFormat format : cfg.outputFormats)\n> -\t\t\tformats[format].push_back(cfg.outputSizes);\n> -\t}\n> +\tfor (const SimpleCameraData::Configuration &cfg : data->configs_)\n> +\t\tif (static_cast(data->swIsp_) == cfg.swisp)\n> +\t\t\tfor (PixelFormat format : cfg.outputFormats)\n> +\t\t\t\tformats[format].push_back(cfg.outputSizes);\n> \n> \t/* Sort the sizes and merge any consecutive overlapping ranges. */\n> \tfor (auto &[format, sizes] : formats) {","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 72AC1BDCBF\n\tfor ;\n\tSun, 26 Jan 2025 21:30:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5C1746855D;\n\tSun, 26 Jan 2025 22:30:17 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 81BD568506\n\tfor ;\n\tSun, 26 Jan 2025 22:30:15 +0100 (CET)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5FC31BC0;\n\tSun, 26 Jan 2025 22:29:09 +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=\"oPN87aPy\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1737926949;\n\tbh=XNWFwIquXKJdRoPx8CLyFKzX9eJzolz+2eMpPj7Fb24=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=oPN87aPyniM6Undc4eeUrjQMFza+HGQhJlNeoR1Q4IJgFubbHbqKEVdNir9cY/YIj\n\t32rhpfUoHGY6c4ZoY0ozWBgKdPP6TKiEdNa5a6FwAY6QVVkIv8q2beBJEghZbojunJ\n\t4UA2xpB3kW+Tkifn/VQO43m9McGZ7dX8ulrUqGz0=","Date":"Sun, 26 Jan 2025 23:30:04 +0200","From":"Laurent Pinchart ","To":"Milan Zamazal ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [RFC PATCH v2 04/13] libcamera: simple: Add plain output\n\tconfigurations to software ISP","Message-ID":"<20250126213004.GC1133@pendragon.ideasonboard.com>","References":"<20250124215806.158024-1-mzamazal@redhat.com>\n\t<20250124215806.158024-5-mzamazal@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20250124215806.158024-5-mzamazal@redhat.com>","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\" "}}]