[{"id":11388,"web_url":"https://patchwork.libcamera.org/comment/11388/","msgid":"<20200714213129.GD5854@pendragon.ideasonboard.com>","date":"2020-07-14T21:31:29","subject":"Re: [libcamera-devel] [PATCH 09/20] libcamera: ipu3: Report\n\tStreamFormats","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Tue, Jul 14, 2020 at 12:42:01PM +0200, Jacopo Mondi wrote:\n> Report StreamFormats associated to each StreamConfiguration generated\n> by the IPU3 pipeline handler.\n> \n> The StreamFormats are generated differently for RAW and processed\n> streams, with the former using the sensor enumerated resolutions and\n> the latter using a continuous range of sizes constructed by matching the\n> sensor capabilities with the platform constraints.\n> \n> Reviewed-by: Niklas Söderlund \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 45 +++++++++++++++++++---------\n> 1 file changed, 31 insertions(+), 14 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 517d9bd11fbf..b480d41f89ab 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -313,7 +313,10 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n> \n> \tSize sensorResolution = data->cio2_.sensor()->resolution();\n> \tfor (const StreamRole role : roles) {\n> -\t\tStreamConfiguration cfg = {};\n> +\t\tstd::map> streamFormats;\n> +\t\tunsigned int bufferCount;\n> +\t\tPixelFormat pixelFormat;\n> +\t\tSize size;\n> \n> \t\tswitch (role) {\n> \t\tcase StreamRole::StillCapture:\n> @@ -322,18 +325,26 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n> \t\t\t * output constraints and required frame margin\n> \t\t\t * by rounding down to the closest alignment.\n> \t\t\t */\n> -\t\t\tcfg.size = sensorResolution.boundedTo(IMGU_OUTPUT_MAX_SIZE);\n> -\t\t\tcfg.size.width = utils::alignDown(cfg.size.width - 1,\n> -\t\t\t\t\t\t\t IMGU_OUTPUT_WIDTH_MARGIN);\n> -\t\t\tcfg.size.height = utils::alignDown(cfg.size.height - 1,\n> -\t\t\t\t\t\t\t IMGU_OUTPUT_HEIGHT_MARGIN);\n> -\t\t\tcfg.pixelFormat = formats::NV12;\n> -\t\t\tcfg.bufferCount = IPU3_BUFFER_COUNT;\n> +\t\t\tsize = sensorResolution.boundedTo(IMGU_OUTPUT_MAX_SIZE);\n> +\t\t\tsize.width = utils::alignDown(size.width - 1,\n> +\t\t\t \t\t\t IMGU_OUTPUT_WIDTH_MARGIN);\n> +\t\t\tsize.height = utils::alignDown(size.height - 1,\n> +\t\t\t\t\t\t IMGU_OUTPUT_HEIGHT_MARGIN);\n> +\t\t\tpixelFormat = formats::NV12;\n> +\t\t\tbufferCount = IPU3_BUFFER_COUNT;\n> +\t\t\tstreamFormats[pixelFormat] = { { IMGU_OUTPUT_MIN_SIZE, size } };\n> \n> \t\t\tbreak;\n> \n> \t\tcase StreamRole::StillCaptureRaw: {\n> -\t\t\tcfg = data->cio2_.generateConfiguration(sensorResolution);\n> +\t\t\tStreamConfiguration cio2Config =\n> +\t\t\t\tdata->cio2_.generateConfiguration(sensorResolution);\n> +\t\t\tpixelFormat = cio2Config.pixelFormat;\n> +\t\t\tsize = cio2Config.size;\n> +\t\t\tbufferCount = cio2Config.bufferCount;\n> +\n> +\t\t\tfor (const PixelFormat &format : data->cio2_.formats())\n> +\t\t\t\tstreamFormats[format] = data->cio2_.sizes();\n> \n> \t\t\tbreak;\n> \t\t}\n> @@ -345,11 +356,12 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n> \t\t\t * capped to the maximum sensor resolution and aligned\n> \t\t\t * to the ImgU output constraints.\n> \t\t\t */\n> -\t\t\tcfg.size = sensorResolution.boundedTo({ 1280, 720 })\n> -\t\t\t\t\t\t .alignedDownTo(IMGU_OUTPUT_WIDTH_ALIGN,\n> -\t\t\t\t\t\t\t IMGU_OUTPUT_HEIGHT_ALIGN);\n> -\t\t\tcfg.pixelFormat = formats::NV12;\n> -\t\t\tcfg.bufferCount = IPU3_BUFFER_COUNT;\n> +\t\t\tsize = sensorResolution.boundedTo({ 1280, 720 })\n> +\t\t\t\t\t .alignedDownTo(IMGU_OUTPUT_WIDTH_ALIGN,\n> +\t\t\t\t\t\t\t IMGU_OUTPUT_HEIGHT_ALIGN);\n> +\t\t\tpixelFormat = formats::NV12;\n> +\t\t\tbufferCount = IPU3_BUFFER_COUNT;\n> +\t\t\tstreamFormats[pixelFormat] = { { IMGU_OUTPUT_MIN_SIZE, size } };\n> \n> \t\t\tbreak;\n> \t\t}\n> @@ -361,6 +373,11 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n> \t\t\treturn nullptr;\n> \t\t}\n> \n> +\t\tStreamFormats formats(streamFormats);\n> +\t\tStreamConfiguration cfg(formats);\n> +\t\tcfg.size = size;\n> +\t\tcfg.pixelFormat = pixelFormat;\n> +\t\tcfg.bufferCount = bufferCount;\n> \t\tconfig->addConfiguration(cfg);\n> \t}\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 0612BBD792\n\tfor ;\n\tTue, 14 Jul 2020 21:31:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 95FD5608EB;\n\tTue, 14 Jul 2020 23:31:37 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 842F0605AC\n\tfor ;\n\tTue, 14 Jul 2020 23:31:36 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0F0BD71D;\n\tTue, 14 Jul 2020 23:31:35 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"pxrNyw7U\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594762296;\n\tbh=DBkg3reVMGfc9ICIr0d7IrN3DlLluEIS0nens9wIVHo=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=pxrNyw7UrZ/ORaLNls82HbPtHVm59gz4AxMGXuyPOiQIAt4V6hTLqbp5782cXRge/\n\tWKR3LVqTNmwj+9dFRBz7BlUZqwHTcsomjNNVhU4v3tf/RGo30LRibVFa0TWIbhByXw\n\t5epLi8vdWwmqDRnmGfofDxBYY+bXmqesSRL/ongc=","Date":"Wed, 15 Jul 2020 00:31:29 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"<20200714213129.GD5854@pendragon.ideasonboard.com>","References":"<20200714104212.48683-1-jacopo@jmondi.org>\n\t<20200714104212.48683-10-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200714104212.48683-10-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH 09/20] libcamera: ipu3: Report\n\tStreamFormats","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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]