[{"id":4248,"web_url":"https://patchwork.libcamera.org/comment/4248/","msgid":"<20200324080924.yyjczrtachecg2dm@uno.localdomain>","date":"2020-03-24T08:12:31","subject":"Re: [libcamera-devel] [PATCH 2/3] libcamera: pipeline: rkisp1: Use\n\tparameterized StreamConfiguration","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Kaaira,\n\nOn Tue, Mar 24, 2020 at 04:59:00AM +0530, Kaaira Gupta wrote:\n> Replace default constructor StreamConfiguration() by it's parameterized\n> counterpart by using StreamFormats in generateConfiguration() in\n> rkisp1.\n\nLooks good!\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n>\n> Signed-off-by: Kaaira Gupta \n> ---\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 39 ++++++++++++++++--------\n> 1 file changed, 27 insertions(+), 12 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 04b0ed3..cfbfc9e 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -218,6 +218,21 @@ private:\n> \tCamera *activeCamera_;\n> };\n>\n> +namespace {\n> +\n> +static const std::array formats{\n> +\tPixelFormat(DRM_FORMAT_YUYV),\n> +\tPixelFormat(DRM_FORMAT_YVYU),\n> +\tPixelFormat(DRM_FORMAT_VYUY),\n> +\tPixelFormat(DRM_FORMAT_NV16),\n> +\tPixelFormat(DRM_FORMAT_NV61),\n> +\tPixelFormat(DRM_FORMAT_NV21),\n> +\tPixelFormat(DRM_FORMAT_NV12),\n> +\t/* \\todo Add support for 8-bit greyscale to DRM formats */\n> +};\n> +\n> +} /* namespace */\n> +\n> RkISP1Frames::RkISP1Frames(PipelineHandler *pipe)\n> \t: pipe_(dynamic_cast(pipe))\n> {\n> @@ -430,17 +445,6 @@ RkISP1CameraConfiguration::RkISP1CameraConfiguration(Camera *camera,\n>\n> CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n> {\n> -\tstatic const std::array formats{\n> -\t\tPixelFormat(DRM_FORMAT_YUYV),\n> -\t\tPixelFormat(DRM_FORMAT_YVYU),\n> -\t\tPixelFormat(DRM_FORMAT_VYUY),\n> -\t\tPixelFormat(DRM_FORMAT_NV16),\n> -\t\tPixelFormat(DRM_FORMAT_NV61),\n> -\t\tPixelFormat(DRM_FORMAT_NV21),\n> -\t\tPixelFormat(DRM_FORMAT_NV12),\n> -\t\t/* \\todo Add support for 8-bit greyscale to DRM formats */\n> -\t};\n> -\n> \tconst CameraSensor *sensor = data_->sensor_;\n> \tStatus status = Valid;\n>\n> @@ -541,7 +545,18 @@ CameraConfiguration *PipelineHandlerRkISP1::generateConfiguration(Camera *camera\n> \tif (roles.empty())\n> \t\treturn config;\n>\n> -\tStreamConfiguration cfg{};\n> +\tstd::map> pixelformats;\n> +\tfor (PixelFormat pixelformat : formats) {\n> +\t\tstd::vector sizes{\n> +\t\t\t/* Minimum and maximum capabilities of ISP output */\n> +\t\t\tSizeRange{ { 32, 16 }, { 4416, 3312 } }\n> +\t\t};\n> +\t\tpixelformats[pixelformat] = sizes;\n> +\t}\n> +\n> +\tStreamFormats format(pixelformats);\n> +\tStreamConfiguration cfg(format);\n> +\n> \tcfg.pixelFormat = PixelFormat(DRM_FORMAT_NV12);\n> \tcfg.size = data->sensor_->resolution();\n>\n> --\n> 2.17.1\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3721A60411\n\tfor ;\n\tTue, 24 Mar 2020 09:09:35 +0100 (CET)","from uno.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 0778160010;\n\tTue, 24 Mar 2020 08:09:32 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Tue, 24 Mar 2020 09:12:31 +0100","From":"Jacopo Mondi ","To":"Kaaira Gupta ","Cc":"libcamera-devel@lists.libcamera.org,\n\tKieran Bingham ,\n\tHelen Koike ,\n\tVaishali Thakkar ","Message-ID":"<20200324080924.yyjczrtachecg2dm@uno.localdomain>","References":"<20200323232901.29169-1-kgupta@es.iitr.ac.in>\n\t<20200323232901.29169-3-kgupta@es.iitr.ac.in>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200323232901.29169-3-kgupta@es.iitr.ac.in>","Subject":"Re: [libcamera-devel] [PATCH 2/3] libcamera: pipeline: rkisp1: Use\n\tparameterized StreamConfiguration","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","X-List-Received-Date":"Tue, 24 Mar 2020 08:09:35 -0000"}}]