Patch Detail
Show a patch.
GET /api/patches/23146/?format=api
{ "id": 23146, "url": "https://patchwork.libcamera.org/api/patches/23146/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23146/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20250407085639.16180-6-mzamazal@redhat.com>", "date": "2025-04-07T08:56:31", "name": "[v4,05/11] libcamera: simple: Add plain output configurations", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "6d55d370c1db70e5700c311078bf83f45263a74c", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/23146/mbox/", "series": [ { "id": 5117, "url": "https://patchwork.libcamera.org/api/series/5117/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5117", "date": "2025-04-07T08:56:26", "name": "Enable raw streams with software ISP", "version": 4, "mbox": "https://patchwork.libcamera.org/series/5117/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23146/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23146/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 EF009C327D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 7 Apr 2025 08:57:16 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 771D4689F5;\n\tMon, 7 Apr 2025 10:57:16 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ECC5F689AF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 7 Apr 2025 10:57:11 +0200 (CEST)", "from mx-prod-mc-03.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-658-PstUlyaPN96RMEN18hDuNA-1;\n\tMon, 07 Apr 2025 04:57:09 -0400", "from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.111])\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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 85CE41944D17; Mon, 7 Apr 2025 08:57:08 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.224.129])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 9ADF21809BE8; Mon, 7 Apr 2025 08:57:06 +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=\"JtAG+T1U\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1744016231;\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=ScCUY5CxECfN4e/E9w0iTDuE0ehmVV2f3aFjLZsYxg0=;\n\tb=JtAG+T1UMAdQzvtr2wLuFhd7xQKzLy/GV+zM17MqbPhBw41R5k/5nxFaqYQ45UeMhs/kj/\n\tmPOVAxrRyXRu61E5FzNYtwDUNGBE2iSY3IU/cnRX/04Z/BBPM5HQVvUbLKX8err8wL1gj7\n\tWuAnBIlHBc95kXjeXmI4WHLwQVlDpDI=", "X-MC-Unique": "PstUlyaPN96RMEN18hDuNA-1", "X-Mimecast-MFC-AGG-ID": "PstUlyaPN96RMEN18hDuNA_1744016228", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>", "Subject": "[PATCH v4 05/11] libcamera: simple: Add plain output configurations", "Date": "Mon, 7 Apr 2025 10:56:31 +0200", "Message-ID": "<20250407085639.16180-6-mzamazal@redhat.com>", "In-Reply-To": "<20250407085639.16180-1-mzamazal@redhat.com>", "References": "<20250407085639.16180-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.111", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "piVMn5WhHJDXmBJV5XnglfAyud2gBzup9mTnC6Asyt0_1744016228", "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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Output configurations in simple pipeline are added depending on whether\na converter, software ISP or none of them are used. If a converter or\nsoftware ISP is used, no raw output configurations are added.\n\nIn order to support raw output at least with software ISP, let's always\nadd raw output configurations. A flag is added to\nSimpleCameraData::Configuration indicating whether it's for a raw or a\nconverted output. We later filter formats and output sizes for\nparticular stream configurations according to the new configuration\nflag.\n\nThis is just preparation and raw output is still not supported. At the\nmoment, we simply filter out raw configurations unconditionally to keep\nthe current code working; this will be changed in followup patches.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n src/libcamera/pipeline/simple/simple.cpp | 31 +++++++++++++++---------\n 1 file changed, 19 insertions(+), 12 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 60b7e1b1..82d7a9a5 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -319,6 +319,7 @@ public:\n \t\tSize captureSize;\n \t\tstd::vector<PixelFormat> outputFormats;\n \t\tSizeRange outputSizes;\n+\t\tbool raw;\n \t};\n \n \tstd::vector<Stream> streams_;\n@@ -708,27 +709,33 @@ void SimpleCameraData::tryPipeline(unsigned int code, const Size &size)\n \t\t\tcontinue;\n \n \t\tConfiguration config;\n+\n+\t\t/* Raw configuration */\n \t\tconfig.code = code;\n \t\tconfig.sensorSize = size;\n \t\tconfig.captureFormat = pixelFormat;\n \t\tconfig.captureSize = format.size;\n+\t\tconfig.outputFormats = { pixelFormat };\n+\t\tconfig.outputSizes = config.captureSize;\n+\t\tconfig.raw = true;\n+\t\tconfigs_.push_back(config);\n \n+\t\t/* Modified, non-raw, configuration */\n+\t\tconfig.raw = false;\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\tstd::vector<PixelFormat> outputFormats = swIsp_->formats(pixelFormat);\n+\t\t\tif (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\tcontinue;\n \t\t\t}\n+\t\t\tconfig.outputFormats = outputFormats;\n+\t\t\tconfig.outputSizes = swIsp_->sizes(pixelFormat, format.size);\n \t\t} else {\n-\t\t\tconfig.outputFormats = { pixelFormat };\n-\t\t\tconfig.outputSizes = config.captureSize;\n+\t\t\tcontinue;\n \t\t}\n-\n \t\tconfigs_.push_back(config);\n \t}\n }\n@@ -1301,10 +1308,10 @@ SimplePipelineHandler::generateConfiguration(Camera *camera, Span<const StreamRo\n \t/* Create the formats map. */\n \tstd::map<PixelFormat, std::vector<SizeRange>> 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 (!cfg.raw)\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) {\n", "prefixes": [ "v4", "05/11" ] }