[{"id":26544,"web_url":"https://patchwork.libcamera.org/comment/26544/","msgid":"","date":"2023-03-03T08:53:57","subject":"Re: [libcamera-devel] [PATCH v2 4/4] libcamera: rkisp1: Fix\n\tenumeration of RAW formats","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"On Wed, Feb 22, 2023 at 04:19:17PM +0100, Jacopo Mondi via libcamera-devel wrote:\n> The current implementation enumerates a single RAW format (the sensor's\n\ns/a single/a single size/ ?\n\n> resolution) and does that regardless of what role the\n> CameraConfiguration has been generated for.\n> \n> Fix this by:\n> - Enumerate RAW StreamFormats only when the requested role is\n> StreamRole::Raw\n> - Add all the sensor's provided resolutions that fit the video device\n> output maximum size\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Paul Elder \n\n> ---\n> src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 19 +++++++++++++++++--\n> 1 file changed, 17 insertions(+), 2 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> index a27ac6fc35cb..0e4d76677732 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> @@ -150,18 +150,33 @@ RkISP1Path::generateConfiguration(const CameraSensor *sensor,\n> \tfor (const auto &format : streamFormats_) {\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\t\tif (role == StreamRole::Raw)\n> +\t\t\t\tcontinue;\n> +\n> \t\t\tstreamFormats[format] = { { minResolution, maxResolution } };\n> \t\t\tcontinue;\n> \t\t}\n> \n> -\t\t/* Skip raw formats not supported by the sensor. */\n> +\t\t/* Skip RAW formats for non-raw roles. */\n> +\t\tif (role != StreamRole::Raw)\n> +\t\t\tcontinue;\n> +\n> +\t\t/* Populate stream formats for RAW configurations. */\n> \t\tuint32_t mbusCode = formatToMediaBus.at(format);\n> \t\tif (std::find(mbusCodes.begin(), mbusCodes.end(), mbusCode) ==\n> \t\t mbusCodes.end())\n> +\t\t\t/* Skip formats not supported by sensor. */\n> \t\t\tcontinue;\n> \n> -\t\tstreamFormats[format] = { { resolution, resolution } };\n> +\t\t/* Add all the RAW sizes the sensor can produce for this code. */\n> +\t\tfor (const auto &rawSize : sensor->sizes(mbusCode)) {\n> +\t\t\tif (rawSize > maxResolution_)\n> +\t\t\t\tcontinue;\n> +\n> +\t\t\tstreamFormats[format].push_back({ rawSize, rawSize });\n> +\t\t}\n> \n> \t\t/*\n> \t\t * Store the raw format with the highest bits per pixel for\n> -- \n> 2.39.0\n>","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 AAE9ABF415\n\tfor ;\n\tFri, 3 Mar 2023 08:54:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EC7FE626EB;\n\tFri, 3 Mar 2023 09:54:06 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9E4C662662\n\tfor ;\n\tFri, 3 Mar 2023 09:54:05 +0100 (CET)","from pyrite.rasen.tech (h175-177-042-159.catv02.itscom.jp\n\t[175.177.42.159])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id AD734735;\n\tFri, 3 Mar 2023 09:54:03 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1677833647;\n\tbh=rzCeTKCjankjabZxMJrpQcM1LBtSsrkg7yzBwe/lcvk=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=NZ8Ylz4OKSU/ebH2ygL6L6R1shweGhqh04Oopk1KocGYycqjtK0dGyp5fP3CYoMQz\n\t4odq4R+JHq0pALP72tI+YKh8hxXfXHHm+RGM079H3uM5HOndMChwzmk5QmeR15EggV\n\tCMbZHHQk9JITZT4DxSyEKXrAYW9Yi9heBe2+Anb6Ppy7a4fzsGi2gDWO3FT6Y1svzk\n\tva1R+9TGD5i97sOhnT2gH09TfrMCVpMRyFSfMfqV+7XYrscBRYyWod3TuBi/HlWkKJ\n\tq39YRSy8ifEwilqsVM4KQQahPLla7PvqlIBHwQJtnbMxXPFLiScDVh69F3PtuNDF61\n\ttwIR/D5okwb+A==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1677833645;\n\tbh=rzCeTKCjankjabZxMJrpQcM1LBtSsrkg7yzBwe/lcvk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=FlM+KuJIU5QXEfCjtPjptA1Gv3e6OMNEmloe2+uoPBvARZJeti7A7WKgi4ctq3TJ2\n\tL8pSyOi0yuFtBO2OXTKL/TVkMzJ9qxAGaMxHzfeGLm0w/wz3CmJy2OLtmZS1eEDjVU\n\tOfpwAmz02xWM2GEj//5Gpdyp1zUFpd+aacVnYPCA="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"FlM+KuJI\"; dkim-atps=neutral","Date":"Fri, 3 Mar 2023 17:53:57 +0900","To":"Jacopo Mondi ","Message-ID":"","References":"<20230222151917.669526-1-jacopo.mondi@ideasonboard.com>\n\t<20230222151917.669526-5-jacopo.mondi@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20230222151917.669526-5-jacopo.mondi@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 4/4] libcamera: rkisp1: Fix\n\tenumeration of RAW formats","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","From":"Paul Elder via libcamera-devel ","Reply-To":"Paul Elder ","Cc":"libcamera-devel@lists.libcamera.org, libcamera@luigi311.com","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":26584,"web_url":"https://patchwork.libcamera.org/comment/26584/","msgid":"<20230307113048.pba4ct7g4u3ewg2a@uno.localdomain>","date":"2023-03-07T11:30:48","subject":"Re: [libcamera-devel] [PATCH v2 4/4] libcamera: rkisp1: Fix\n\tenumeration of RAW formats","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"Hi Paul\n\nOn Fri, Mar 03, 2023 at 05:53:57PM +0900, Paul Elder via libcamera-devel wrote:\n> On Wed, Feb 22, 2023 at 04:19:17PM +0100, Jacopo Mondi via libcamera-devel wrote:\n> > The current implementation enumerates a single RAW format (the sensor's\n>\n> s/a single/a single size/ ?\n\nI actually meant \"single RAW format\" as I'm referring to\n\"StreamFormats\". Can I keep it this way or is it grammatically wrong ?\n\n>\n> > resolution) and does that regardless of what role the\n> > CameraConfiguration has been generated for.\n> >\n> > Fix this by:\n> > - Enumerate RAW StreamFormats only when the requested role is\n> > StreamRole::Raw\n> > - Add all the sensor's provided resolutions that fit the video device\n> > output maximum size\n> >\n> > Signed-off-by: Jacopo Mondi \n>\n> Reviewed-by: Paul Elder \n\nThanks\n\n>\n> > ---\n> > src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 19 +++++++++++++++++--\n> > 1 file changed, 17 insertions(+), 2 deletions(-)\n> >\n> > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> > index a27ac6fc35cb..0e4d76677732 100644\n> > --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> > +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> > @@ -150,18 +150,33 @@ RkISP1Path::generateConfiguration(const CameraSensor *sensor,\n> > \tfor (const auto &format : streamFormats_) {\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\t\tif (role == StreamRole::Raw)\n> > +\t\t\t\tcontinue;\n> > +\n> > \t\t\tstreamFormats[format] = { { minResolution, maxResolution } };\n> > \t\t\tcontinue;\n> > \t\t}\n> >\n> > -\t\t/* Skip raw formats not supported by the sensor. */\n> > +\t\t/* Skip RAW formats for non-raw roles. */\n> > +\t\tif (role != StreamRole::Raw)\n> > +\t\t\tcontinue;\n> > +\n> > +\t\t/* Populate stream formats for RAW configurations. */\n> > \t\tuint32_t mbusCode = formatToMediaBus.at(format);\n> > \t\tif (std::find(mbusCodes.begin(), mbusCodes.end(), mbusCode) ==\n> > \t\t mbusCodes.end())\n> > +\t\t\t/* Skip formats not supported by sensor. */\n> > \t\t\tcontinue;\n> >\n> > -\t\tstreamFormats[format] = { { resolution, resolution } };\n> > +\t\t/* Add all the RAW sizes the sensor can produce for this code. */\n> > +\t\tfor (const auto &rawSize : sensor->sizes(mbusCode)) {\n> > +\t\t\tif (rawSize > maxResolution_)\n> > +\t\t\t\tcontinue;\n> > +\n> > +\t\t\tstreamFormats[format].push_back({ rawSize, rawSize });\n> > +\t\t}\n> >\n> > \t\t/*\n> > \t\t * Store the raw format with the highest bits per pixel for\n> > --\n> > 2.39.0\n> >","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 753ADBE080\n\tfor ;\n\tTue, 7 Mar 2023 11:30:54 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CBD266265E;\n\tTue, 7 Mar 2023 12:30:53 +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 6F9BE6265E\n\tfor ;\n\tTue, 7 Mar 2023 12:30:52 +0100 (CET)","from ideasonboard.com (host-79-47-54-87.retail.telecomitalia.it\n\t[79.47.54.87])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B918BEF;\n\tTue, 7 Mar 2023 12:30:51 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1678188653;\n\tbh=7vpDKeWHjjrwtCm6CVuzaRXUBcIZyIMOT5bXrnq5rM8=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=G+Getp9E7/T7R3toegCbPNpA3BECZTPDLH+i0wkUW41OmbpS1Q4Vk4DCbRbGh3JFW\n\tkTohlcJIHi/Zjn1eUoCFrQ/zj9Vb0/LNBqw03Ns2dcmmfHl3mkZcB9yHI0vK3MXETV\n\tV5MPT3b+uAj2lM3KzJO+m7UH6ARVkcvl7jvOQWUkLrRXiPsncfYXBgfUH5tyAeWl/w\n\tEJek9JcupMWh5Y7sXpZEKJNRDo5akVurLD0T5SU/gvmPsmvXxLJTCgC/kqzXI1HwLL\n\tAuuK1wyub1AsmxJ8BBmqr3hVKONCFzccM/IHVampjYYn/NSAKDyDtqM9Prz9KeBaDA\n\tRieoWsCDC6xKg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1678188651;\n\tbh=7vpDKeWHjjrwtCm6CVuzaRXUBcIZyIMOT5bXrnq5rM8=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=eBGHOivXGHkWb9hYymkTHTgCSr+ma2oSWYTczOFdXBbIyVa411glTGnihKT/kOn8H\n\tmUnfKDQ/KM7Lg+hg67+SuJqofZYm2VEYdnZtWdTIPxmrYKn7WWcmIKYIzSu2V3rXzU\n\tkbmRxEg3Z51rD812WblDF1KXlmm8YsIgnGYFO2IE="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"eBGHOivX\"; dkim-atps=neutral","Date":"Tue, 7 Mar 2023 12:30:48 +0100","To":"Paul Elder ","Message-ID":"<20230307113048.pba4ct7g4u3ewg2a@uno.localdomain>","References":"<20230222151917.669526-1-jacopo.mondi@ideasonboard.com>\n\t<20230222151917.669526-5-jacopo.mondi@ideasonboard.com>\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [PATCH v2 4/4] libcamera: rkisp1: Fix\n\tenumeration of RAW formats","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","From":"Jacopo Mondi via libcamera-devel ","Reply-To":"Jacopo Mondi ","Cc":"Jacopo Mondi ,\n\tlibcamera-devel@lists.libcamera.org, libcamera@luigi311.com","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]