{"id":23435,"url":"https://patchwork.libcamera.org/api/patches/23435/?format=json","web_url":"https://patchwork.libcamera.org/patch/23435/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20250526101536.29222-5-mzamazal@redhat.com>","date":"2025-05-26T10:15:24","name":"[v6,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=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23435/mbox/","series":[{"id":5194,"url":"https://patchwork.libcamera.org/api/series/5194/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5194","date":"2025-05-26T10:15:20","name":"Enable raw streams with software ISP","version":6,"mbox":"https://patchwork.libcamera.org/series/5194/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23435/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23435/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 F2A2BC31E9\n\tfor ;\n\tMon, 26 May 2025 10:16:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 876BF68DA9;\n\tMon, 26 May 2025 12:16:04 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 101A668D96\n\tfor ;\n\tMon, 26 May 2025 12:15:59 +0200 (CEST)","from mx-prod-mc-02.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-171-YYJc-lYDP-iPqfGJqnUF8w-1;\n\tMon, 26 May 2025 06:15:55 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id A316C195608C; Mon, 26 May 2025 10:15:54 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.226.78])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 4F4F5180045B; Mon, 26 May 2025 10:15:51 +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=\"gR97VrqZ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1748254559;\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=Z5mEcTEmeRwXb+Wda/Q7oNRG48KniGLV0vHYEEI8zNc=;\n\tb=gR97VrqZOAN7RU27YAX/NtHDZAN3YE8eKfsK9vKSM4dW5zOMJJ1uWt8d4+57WsRIqEfg8e\n\tnSHjF1jbMwCqzv8yv1w+MJzlLrRUSR80pxjXBUlYYqXE0+9QHLa5lyvgwiy3gLeNS9tBxZ\n\tCmgK/GcUbNPzYawWNY9Q0eaX/vruTiE=","X-MC-Unique":"YYJc-lYDP-iPqfGJqnUF8w-1","X-Mimecast-MFC-AGG-ID":"YYJc-lYDP-iPqfGJqnUF8w_1748254554","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal , Laurent Pinchart\n\t, Kieran Bingham\n\t, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t, Paul Elder\n\t","Subject":"[PATCH v6 04/12] libcamera: formats: Add a helper to check for a raw\n\tpixel info","Date":"Mon, 26 May 2025 12:15:24 +0200","Message-ID":"<20250526101536.29222-5-mzamazal@redhat.com>","In-Reply-To":"<20250526101536.29222-1-mzamazal@redhat.com>","References":"<20250526101536.29222-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":"FkNtU5w2afxAMdSfDIaNiVa8Iz3ApFQ1QDrx3Wy0kHU_1748254554","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":"","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":"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 \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 bc4417d0..dd81a888 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 c6e0a262..02888acf 100644\n--- a/src/libcamera/formats.cpp\n+++ b/src/libcamera/formats.cpp\n@@ -993,6 +993,12 @@ const std::map 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 ad36ebea..5feaaa65 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 &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 e31e3879..6d10ed7f 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 50c83fb7..4c6be9b7 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 64018dc5..3e437b0c 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":["v6","04/12"]}