Patch Detail
Show a patch.
GET /api/patches/23676/?format=api
{ "id": 23676, "url": "https://patchwork.libcamera.org/api/patches/23676/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23676/", "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": "<20250627113449.23106-5-mzamazal@redhat.com>", "date": "2025-06-27T11:34:39", "name": "[v7,04/12] libcamera: formats: Add a helper to check for a raw pixel info", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "728b7854453a691cbf649f55c8fd50433faeef97", "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/23676/mbox/", "series": [ { "id": 5255, "url": "https://patchwork.libcamera.org/api/series/5255/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5255", "date": "2025-06-27T11:34:36", "name": "Enable raw streams with software ISP", "version": 7, "mbox": "https://patchwork.libcamera.org/series/5255/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23676/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23676/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 100E3BDCBF\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 27 Jun 2025 11:35:15 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 760DF68E0A;\n\tFri, 27 Jun 2025 13:35:14 +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 9630068DFD\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 27 Jun 2025 13:35:11 +0200 (CEST)", "from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-16-e1Bix66AP6aBwlT753ItBw-1;\n\tFri, 27 Jun 2025 07:35:07 -0400", "from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 4FE141800290; Fri, 27 Jun 2025 11:35:06 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.226.86])\n\tby mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 1F68C30001BC; Fri, 27 Jun 2025 11:35:03 +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=\"g3v+YJ3+\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1751024110;\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=soUfJXaDR+wU0GsG/WvnXKBnUeh/fIwyGCIli0b4ing=;\n\tb=g3v+YJ3+/r9nPmF257huNSgSImOUFtRsQlvdUy3dWwZzERq2oysLAJbmTt0++/lZ4nWUCL\n\tK6S7YDGz/ScnpAPcVDEcaOJPPu4gISAi4OgCX0yvHC5xLZYinV0KNIN6phRdd57uS0yf1+\n\tEo2cCgxXEWtmqlgtYbovVPcKzaRwDL4=", "X-MC-Unique": "e1Bix66AP6aBwlT753ItBw-1", "X-Mimecast-MFC-AGG-ID": "e1Bix66AP6aBwlT753ItBw_1751024106", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>, Laurent Pinchart\n\t<laurent.pinchart@ideasonboard.com>, Kieran Bingham\n\t<kieran.bingham@ideasonboard.com>, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t<barnabas.pocze@ideasonboard.com>, Paul Elder\n\t<paul.elder@ideasonboard.com>", "Subject": "[PATCH v7 04/12] libcamera: formats: Add a helper to check for a raw\n\tpixel info", "Date": "Fri, 27 Jun 2025 13:34:39 +0200", "Message-ID": "<20250627113449.23106-5-mzamazal@redhat.com>", "In-Reply-To": "<20250627113449.23106-1-mzamazal@redhat.com>", "References": "<20250627113449.23106-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.4", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "pDTudQQX7pPNZbhtEtAuLddjK0opyX9_hXPAwsCPdL8_1751024106", "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": "There is another common pattern checking for raw colour encoding,\npresent in multiple places:\n\n pixelFormatInfo.colourEncoding == PixelFormatInfo::ColourEncodingRAW\n\nLet's extract it into a helper too.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n include/libcamera/internal/formats.h | 1 +\n src/libcamera/formats.cpp | 9 +++++++--\n src/libcamera/pipeline/imx8-isi/imx8-isi.cpp | 7 +++----\n src/libcamera/pipeline/ipu3/ipu3.cpp | 4 ++--\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 4 ++--\n src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 7 +++----\n 6 files changed, 18 insertions(+), 14 deletions(-)", "diff": "diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h\nindex bc4417d05..dd81a8889 100644\n--- a/include/libcamera/internal/formats.h\n+++ b/include/libcamera/internal/formats.h\n@@ -32,6 +32,7 @@ public:\n \t};\n \n \tbool isValid() const { return format.isValid(); }\n+\tbool isRaw() const { return colourEncoding == ColourEncodingRAW; }\n \n \tstatic const PixelFormatInfo &info(const PixelFormat &format);\n \tstatic const PixelFormatInfo &info(const V4L2PixelFormat &format);\ndiff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\nindex c6e0a2620..02888acf2 100644\n--- a/src/libcamera/formats.cpp\n+++ b/src/libcamera/formats.cpp\n@@ -993,6 +993,12 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n * \\return True if the pixel format info is valid, false otherwise\n */\n \n+/**\n+ * \\fn bool PixelFormatInfo::isRaw() const\n+ * \\brief Check if the colour encoding is raw\n+ * \\return True if the colour encoding is raw, false otherwise\n+ */\n+\n /**\n * \\brief Retrieve information about a pixel format\n * \\param[in] format The pixel format\n@@ -1222,8 +1228,7 @@ unsigned int PixelFormatInfo::numPlanes() const\n */\n bool isFormatRaw(const libcamera::PixelFormat &pixFmt)\n {\n-\treturn libcamera::PixelFormatInfo::info(pixFmt).colourEncoding ==\n-\t libcamera::PixelFormatInfo::ColourEncodingRAW;\n+\treturn libcamera::PixelFormatInfo::info(pixFmt).isRaw();\n }\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\nindex c9f56af02..cfee5f820 100644\n--- a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n+++ b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n@@ -452,9 +452,8 @@ ISICameraConfiguration::validateYuv(std::set<Stream *> &availableStreams,\n \n \t\t/* If the stream is RAW or not supported default it to YUYV. */\n \t\tconst PixelFormatInfo &cfgInfo = PixelFormatInfo::info(cfg.pixelFormat);\n-\t\tif (cfgInfo.colourEncoding == PixelFormatInfo::ColourEncodingRAW ||\n-\t\t !formatsMap_.count(cfg.pixelFormat)) {\n \n+\t\tif (cfgInfo.isRaw() || !formatsMap_.count(cfg.pixelFormat)) {\n \t\t\tLOG(ISI, Debug) << \"Stream \" << i << \" format: \"\n \t\t\t\t\t<< cfg.pixelFormat << \" adjusted to YUYV\";\n \n@@ -523,7 +522,7 @@ CameraConfiguration::Status ISICameraConfiguration::validate()\n \tconst PixelFormatInfo info = PixelFormatInfo::info(config_[0].pixelFormat);\n \n \tStatus validationStatus;\n-\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW)\n+\tif (info.isRaw())\n \t\tvalidationStatus = validateRaw(availableStreams, maxResolution);\n \telse\n \t\tvalidationStatus = validateYuv(availableStreams, maxResolution);\n@@ -651,7 +650,7 @@ StreamConfiguration PipelineHandlerISI::generateYUVConfiguration(Camera *camera,\n \n \tfor (const auto &[pixFmt, pipeFmt] : ISICameraConfiguration::formatsMap_) {\n \t\tconst PixelFormatInfo &info = PixelFormatInfo::info(pixFmt);\n-\t\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW)\n+\t\tif (info.isRaw())\n \t\t\tcontinue;\n \n \t\tstreamFormats[pixFmt] = { { kMinISISize, sensorSize } };\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex e31e3879d..6d10ed7f9 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -218,7 +218,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \tfor (const StreamConfiguration &cfg : config_) {\n \t\tconst PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat);\n \n-\t\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW) {\n+\t\tif (info.isRaw()) {\n \t\t\trawCount++;\n \t\t\trawSize = std::max(rawSize, cfg.size);\n \t\t} else {\n@@ -286,7 +286,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \n \t\tLOG(IPU3, Debug) << \"Validating stream: \" << config_[i].toString();\n \n-\t\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW) {\n+\t\tif (info.isRaw()) {\n \t\t\t/* Initialize the RAW stream with the CIO2 configuration. */\n \t\t\tcfg->size = cio2Configuration_.size;\n \t\t\tcfg->pixelFormat = cio2Configuration_.pixelFormat;\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 50c83fb72..4c6be9b75 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -651,7 +651,7 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n \n \tfor (const StreamConfiguration &cfg : config_) {\n \t\tconst PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat);\n-\t\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW)\n+\t\tif (info.isRaw())\n \t\t\trawFormat = cfg.pixelFormat;\n \n \t\tmaxSize = std::max(maxSize, cfg.size);\n@@ -842,7 +842,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \tRectangle outputCrop = inputCrop;\n \tconst PixelFormat &streamFormat = config->at(0).pixelFormat;\n \tconst PixelFormatInfo &info = PixelFormatInfo::info(streamFormat);\n-\tisRaw_ = info.colourEncoding == PixelFormatInfo::ColourEncodingRAW;\n+\tisRaw_ = info.isRaw();\n \tuseDewarper_ = dewarper_ && !isRaw_;\n \n \t/* YUYV8_2X8 is required on the ISP source path pad for YUV output. */\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\nindex 64018dc5b..3e437b0c2 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n@@ -188,7 +188,7 @@ RkISP1Path::generateConfiguration(const CameraSensor *sensor, const Size &size,\n \t\tconst PixelFormatInfo &info = PixelFormatInfo::info(format);\n \n \t\t/* Populate stream formats for non-RAW configurations. */\n-\t\tif (info.colourEncoding != PixelFormatInfo::ColourEncodingRAW) {\n+\t\tif (!info.isRaw()) {\n \t\t\tif (role == StreamRole::Raw)\n \t\t\t\tcontinue;\n \n@@ -279,7 +279,7 @@ RkISP1Path::validate(const CameraSensor *sensor,\n \tfor (const auto &format : streamFormats_) {\n \t\tconst PixelFormatInfo &info = PixelFormatInfo::info(format);\n \n-\t\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW) {\n+\t\tif (info.isRaw()) {\n \t\t\t/* Skip raw formats not supported by the sensor. */\n \t\t\tuint32_t mbusCode = formatToMediaBus.at(format);\n \t\t\tif (std::find(mbusCodes.begin(), mbusCodes.end(), mbusCode) ==\n@@ -310,8 +310,7 @@ RkISP1Path::validate(const CameraSensor *sensor,\n \tif (sensorConfig && !rawFormat.isValid())\n \t\treturn CameraConfiguration::Invalid;\n \n-\tbool isRaw = PixelFormatInfo::info(cfg->pixelFormat).colourEncoding ==\n-\t\t PixelFormatInfo::ColourEncodingRAW;\n+\tbool isRaw = PixelFormatInfo::info(cfg->pixelFormat).isRaw();\n \n \t/*\n \t * If no raw format supported by the sensor has been found, use a\n", "prefixes": [ "v7", "04/12" ] }