[{"id":37281,"web_url":"https://patchwork.libcamera.org/comment/37281/","msgid":"<20251211020646.GC24488@pendragon.ideasonboard.com>","date":"2025-12-11T02:06:46","subject":"Re: [RFC PATCH 4/6] pipeline: rkisp1: Add YUV bypass formats to list\n\tof 'raw' formats","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Tue, Dec 09, 2025 at 06:09:52PM +0000, Isaac Scott wrote:\n> When ISP bypass is enabled, we need to be able to match YUV formats as\n> YUV and RAW bypass should be handled the same way by the pipeline\n> handler. Add them.\n> \n> Signed-off-by: Isaac Scott \n> ---\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 31 ++++++++++++++++----\n> src/libcamera/sensor/camera_sensor_basic.cpp | 1 +\n> 2 files changed, 26 insertions(+), 6 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index ad0f3af34..0c8c15ea5 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -520,7 +520,9 @@ void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &meta\n> namespace {\n> \n> /* Keep in sync with the supported raw formats in rkisp1_path.cpp. */\n\nThat seems to be done in patch 5/6. Will the pipeline handler still work\nwhen applying patches 1 to 4 only ? We try to avoid bisection breakages\nunless it would be really, really difficult to do otherwise.\n\n> -const std::map rawFormats = {\n> +const std::map bypassFormats = {\n> +\t{ formats::UYVY, MEDIA_BUS_FMT_UYVY8_1X16 },\n> +\t{ formats::YUYV, MEDIA_BUS_FMT_YUYV8_1X16 },\n> \t{ formats::SBGGR8, MEDIA_BUS_FMT_SBGGR8_1X8 },\n> \t{ formats::SGBRG8, MEDIA_BUS_FMT_SGBRG8_1X8 },\n> \t{ formats::SGRBG8, MEDIA_BUS_FMT_SGRBG8_1X8 },\n> @@ -755,10 +757,27 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n> \n> \tstd::vector mbusCodes;\n> \n> -\tif (isRaw) {\n> -\t\tmbusCodes = { rawFormats.at(config_[0].pixelFormat) };\n> +\tif (isRaw)\n> +\t\tmbusCodes = { bypassFormats.at(config_[0].pixelFormat) };\n> +\n> +\t/* Select the sensor format. */\n> +\tPixelFormat bypassFormat;\n> +\tSize maxSize;\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\t info.colourEncoding == PixelFormatInfo::ColourEncodingYUV)\n> +\t\t\tbypassFormat = cfg.pixelFormat;\n> +\n> +\t\tmaxSize = std::max(maxSize, cfg.size);\n> +\t}\n> +\n> +\tif (bypassFormat.isValid()) {\n> +\t\tLOG(RkISP1, Info) << \"Using bypass format \" << bypassFormat;\n> +\t\tmbusCodes = { bypassFormats.at(bypassFormat) };\n> \t} else {\n> -\t\tstd::transform(rawFormats.begin(), rawFormats.end(),\n> +\t\tstd::transform(bypassFormats.begin(), bypassFormats.end(),\n> \t\t\t std::back_inserter(mbusCodes),\n> \t\t\t [](const auto &value) { return value.second; });\n> \t}\n> @@ -919,8 +938,8 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n> \n> \tconst PixelFormat &streamFormat = config->at(0).pixelFormat;\n> \tconst PixelFormatInfo &info = PixelFormatInfo::info(streamFormat);\n> -\tisRaw_ = info.colourEncoding == PixelFormatInfo::ColourEncodingRAW;\n> -\tdata->usesDewarper_ = data->canUseDewarper_ && !isRaw_;\n> +\tisIspBypassed_ = info.colourEncoding == PixelFormatInfo::ColourEncodingRAW;\n> +\tdata->usesDewarper_ = data->canUseDewarper_ && !isIspBypassed_;\n> \n> \tTransform transform = config->combinedTransform();\n> \tbool transposeAfterIsp = false;\n> diff --git a/src/libcamera/sensor/camera_sensor_basic.cpp b/src/libcamera/sensor/camera_sensor_basic.cpp\n> index 57213a1ab..9531fc192 100644\n> --- a/src/libcamera/sensor/camera_sensor_basic.cpp\n> +++ b/src/libcamera/sensor/camera_sensor_basic.cpp\n> @@ -97,6 +97,7 @@ public:\n> \tint setTestPatternMode(controls::draft::TestPatternModeEnum mode) override;\n> \tconst CameraSensorProperties::SensorDelays &sensorDelays() override;\n> \tBayerFormat::Order bayerOrder(Transform t) const override;\n> +\tOrientation mountingOrientation() const override { return mountingOrientation_; }\n\nSeems unrelated to this patch.\n\n> \n> protected:\n> \tstd::string logPrefix() const override;","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 D5637C3257\n\tfor ;\n\tThu, 11 Dec 2025 02:07:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 006EA6150A;\n\tThu, 11 Dec 2025 03:07:11 +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 485CC606D5\n\tfor ;\n\tThu, 11 Dec 2025 03:07:09 +0100 (CET)","from pendragon.ideasonboard.com (fs96f9c361.tkyc007.ap.nuro.jp\n\t[150.249.195.97])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id DB4EF56D;\n\tThu, 11 Dec 2025 03:07:03 +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=\"vvUSlZfQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1765418825;\n\tbh=5sZfd5H1kk0ObcBMqI6n3gkeE8gi/7BnnMwFwohtteg=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=vvUSlZfQjq+5HXyAJQPkqjS6DHkuQDBewGsWX6DCASSBG8qGElBc8p/HDLkNtJT8e\n\tg82PSgaHivNNoW78E0H0rP+/WO7fCpu1QjbYCfCrLltQ2N/nCQ46q4jAy+Ooq+ODuQ\n\t/iUlruo9k2IUbOwkhfqhlQ8ePB8bg4EIlcjLPCoo=","Date":"Thu, 11 Dec 2025 11:06:46 +0900","From":"Laurent Pinchart ","To":"Isaac Scott ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [RFC PATCH 4/6] pipeline: rkisp1: Add YUV bypass formats to list\n\tof 'raw' formats","Message-ID":"<20251211020646.GC24488@pendragon.ideasonboard.com>","References":"<20251209180954.332392-1-isaac.scott@ideasonboard.com>\n\t<20251209180954.332392-5-isaac.scott@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20251209180954.332392-5-isaac.scott@ideasonboard.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\" "}},{"id":37298,"web_url":"https://patchwork.libcamera.org/comment/37298/","msgid":"<176544984333.76084.15868281577683614716@isaac-ThinkPad-T16-Gen-2>","date":"2025-12-11T10:44:03","subject":"Re: [RFC PATCH 4/6] pipeline: rkisp1: Add YUV bypass formats to list\n\tof 'raw' formats","submitter":{"id":215,"url":"https://patchwork.libcamera.org/api/people/215/","name":"Isaac Scott","email":"isaac.scott@ideasonboard.com"},"content":"Hi Laurent,\n\nThanks for the review!\n\nQuoting Laurent Pinchart (2025-12-11 02:06:46)\n> On Tue, Dec 09, 2025 at 06:09:52PM +0000, Isaac Scott wrote:\n> > When ISP bypass is enabled, we need to be able to match YUV formats as\n> > YUV and RAW bypass should be handled the same way by the pipeline\n> > handler. Add them.\n> > \n> > Signed-off-by: Isaac Scott \n> > ---\n> > src/libcamera/pipeline/rkisp1/rkisp1.cpp | 31 ++++++++++++++++----\n> > src/libcamera/sensor/camera_sensor_basic.cpp | 1 +\n> > 2 files changed, 26 insertions(+), 6 deletions(-)\n> > \n> > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > index ad0f3af34..0c8c15ea5 100644\n> > --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > @@ -520,7 +520,9 @@ void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &meta\n> > namespace {\n> > \n> > /* Keep in sync with the supported raw formats in rkisp1_path.cpp. */\n> \n> That seems to be done in patch 5/6. Will the pipeline handler still work\n> when applying patches 1 to 4 only ? We try to avoid bisection breakages\n> unless it would be really, really difficult to do otherwise.\n\nYes, that does seem to be an oversight on my part, when I submit the\nseries out of RFC I'll make sure to not break bisectability.\n\n> \n> > -const std::map rawFormats = {\n> > +const std::map bypassFormats = {\n> > + { formats::UYVY, MEDIA_BUS_FMT_UYVY8_1X16 },\n> > + { formats::YUYV, MEDIA_BUS_FMT_YUYV8_1X16 },\n> > { formats::SBGGR8, MEDIA_BUS_FMT_SBGGR8_1X8 },\n> > { formats::SGBRG8, MEDIA_BUS_FMT_SGBRG8_1X8 },\n> > { formats::SGRBG8, MEDIA_BUS_FMT_SGRBG8_1X8 },\n> > @@ -755,10 +757,27 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n> > \n> > std::vector mbusCodes;\n> > \n> > - if (isRaw) {\n> > - mbusCodes = { rawFormats.at(config_[0].pixelFormat) };\n> > + if (isRaw)\n> > + mbusCodes = { bypassFormats.at(config_[0].pixelFormat) };\n> > +\n> > + /* Select the sensor format. */\n> > + PixelFormat bypassFormat;\n> > + Size maxSize;\n> > +\n> > + for (const StreamConfiguration &cfg : config_) {\n> > + const PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat);\n> > + if (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW ||\n> > + info.colourEncoding == PixelFormatInfo::ColourEncodingYUV)\n> > + bypassFormat = cfg.pixelFormat;\n> > +\n> > + maxSize = std::max(maxSize, cfg.size);\n> > + }\n> > +\n> > + if (bypassFormat.isValid()) {\n> > + LOG(RkISP1, Info) << \"Using bypass format \" << bypassFormat;\n> > + mbusCodes = { bypassFormats.at(bypassFormat) };\n> > } else {\n> > - std::transform(rawFormats.begin(), rawFormats.end(),\n> > + std::transform(bypassFormats.begin(), bypassFormats.end(),\n> > std::back_inserter(mbusCodes),\n> > [](const auto &value) { return value.second; });\n> > }\n> > @@ -919,8 +938,8 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n> > \n> > const PixelFormat &streamFormat = config->at(0).pixelFormat;\n> > const PixelFormatInfo &info = PixelFormatInfo::info(streamFormat);\n> > - isRaw_ = info.colourEncoding == PixelFormatInfo::ColourEncodingRAW;\n> > - data->usesDewarper_ = data->canUseDewarper_ && !isRaw_;\n> > + isIspBypassed_ = info.colourEncoding == PixelFormatInfo::ColourEncodingRAW;\n> > + data->usesDewarper_ = data->canUseDewarper_ && !isIspBypassed_;\n> > \n> > Transform transform = config->combinedTransform();\n> > bool transposeAfterIsp = false;\n> > diff --git a/src/libcamera/sensor/camera_sensor_basic.cpp b/src/libcamera/sensor/camera_sensor_basic.cpp\n> > index 57213a1ab..9531fc192 100644\n> > --- a/src/libcamera/sensor/camera_sensor_basic.cpp\n> > +++ b/src/libcamera/sensor/camera_sensor_basic.cpp\n> > @@ -97,6 +97,7 @@ public:\n> > int setTestPatternMode(controls::draft::TestPatternModeEnum mode) override;\n> > const CameraSensorProperties::SensorDelays &sensorDelays() override;\n> > BayerFormat::Order bayerOrder(Transform t) const override;\n> > + Orientation mountingOrientation() const override { return mountingOrientation_; }\n> \n> Seems unrelated to this patch.\n\nIndeed, it should go into the patch adding camera_sensor_basic (whatever\nit ends up being) :-)\n\nThanks,\nIsaac\n\n> \n> > \n> > protected:\n> > std::string logPrefix() const override;\n> \n> -- \n> Regards,\n> \n> Laurent Pinchart","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 C25BFC3257\n\tfor ;\n\tThu, 11 Dec 2025 10:44:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D29C6615AC;\n\tThu, 11 Dec 2025 11:44:07 +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 E80FC610A6\n\tfor ;\n\tThu, 11 Dec 2025 11:44:06 +0100 (CET)","from thinkpad.ideasonboard.com\n\t(cpc90716-aztw32-2-0-cust408.18-1.cable.virginm.net [86.26.101.153])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8CB9915D2;\n\tThu, 11 Dec 2025 11:44:04 +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=\"OAZ/WWIt\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1765449844;\n\tbh=wmPduyqQVmxBs2H3ZduBV3LnZmgOjDyBkTQ5QVXoHAc=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=OAZ/WWItyi6P213PMUzU7X5S7nHX3mbCyxGQMExGjO1alSuyPOm80hZUNegOLQDBV\n\tXXwpsjGoxjhwy02pr04vgsqdhZYk48z0NaNfVF7Kr/6Ap5JZYafMf/tnMif2sdOlt5\n\tzd3LPZhXiAKuapMUO9Qxlw/MUWn3NF7s/oilzpjI=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20251211020646.GC24488@pendragon.ideasonboard.com>","References":"<20251209180954.332392-1-isaac.scott@ideasonboard.com>\n\t<20251209180954.332392-5-isaac.scott@ideasonboard.com>\n\t<20251211020646.GC24488@pendragon.ideasonboard.com>","Subject":"Re: [RFC PATCH 4/6] pipeline: rkisp1: Add YUV bypass formats to list\n\tof 'raw' formats","From":"Isaac Scott ","Cc":"libcamera-devel@lists.libcamera.org","To":"Laurent Pinchart ","Date":"Thu, 11 Dec 2025 10:44:03 +0000","Message-ID":"<176544984333.76084.15868281577683614716@isaac-ThinkPad-T16-Gen-2>","User-Agent":"alot/0.10","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\" "}}]