[{"id":4724,"web_url":"https://patchwork.libcamera.org/comment/4724/","msgid":"<20200503003304.GD25636@pendragon.ideasonboard.com>","date":"2020-05-03T00:33:04","subject":"Re: [libcamera-devel] [PATCH] qcam: dng_writer: Add support for\n\tIPU3 Bayer formats","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Sun, May 03, 2020 at 02:27:55AM +0200, Niklas Söderlund wrote:\n> Add support for the Bayer formats produced on the IPU3. The format uses\n> a memory layout that is hard to repack and keep the 10-bit sample size,\n> therefore scale the samples to 16-bit when creating the scanlines.\n> \n> Signed-off-by: Niklas Söderlund \n> ---\n> src/qcam/dng_writer.cpp | 45 +++++++++++++++++++++++++++++++++++++++++\n> 1 file changed, 45 insertions(+)\n> \n> diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp\n> index f0d6f5f473e3d680..7ad52592d4449929 100644\n> --- a/src/qcam/dng_writer.cpp\n> +++ b/src/qcam/dng_writer.cpp\n> @@ -56,6 +56,31 @@ void packScanlineSBGGR12P(void *output, const void *input, unsigned int width)\n> \t}\n> }\n> \n> +void packScanlineIPU3(void *output, const void *input, unsigned int width)\n> +{\n> +\tconst uint8_t *in = static_cast(input);\n> +\tuint16_t *out = static_cast(output);\n> +\n> +\t/*\n> +\t * Upsacle the 10-bit format to 16-bit as it's none trivial to pack it\n\ns/Upsacle/Upscale/\ns/none /non-/\n\n> +\t * it as 10-bits without gaps.\n\ns/it as/as/\n\n> +\t *\n> +\t * \\todo Improve packig to keep the 10-bit sample size.\n\ns/packig/packing/\n\n> +\t */\n> +\tfor (unsigned int x = 0; x < width; x += 25) {\n> +\t\tfor (unsigned int i = 0; i < 6; i++) {\n> +\t\t\t*out++ = ((in[1] & 0x02) << 8 | in[0]) << 6;\n> +\t\t\t*out++ = ((in[2] & 0x0f) << 6 | in[1] >> 2) << 6;\n> +\t\t\t*out++ = ((in[3] & 0x3f) << 4 | in[2] >> 4) << 6;\n> +\t\t\t*out++ = ((in[4] & 0xff) << 2 | in[3] >> 6) << 6;\n> +\t\t\tin += 5;\n> +\t\t}\n> +\n> +\t\t*out++ = ((in[1] & 0x02) << 8 | in[0]) << 6;\n> +\t\tin += 2;\n> +\t}\n> +}\n> +\n> static const std::map formatInfo = {\n> \t{ PixelFormat(DRM_FORMAT_SBGGR10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n> \t\t.bitsPerSample = 10,\n> @@ -97,6 +122,26 @@ static const std::map formatInfo = {\n> \t\t.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },\n> \t\t.packScanline = packScanlineSBGGR12P,\n> \t} },\n> +\t{ PixelFormat(DRM_FORMAT_SBGGR10, IPU3_FORMAT_MOD_PACKED), {\n> +\t\t.bitsPerSample = 16,\n> +\t\t.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },\n> +\t\t.packScanline = packScanlineIPU3,\n> +\t} },\n> +\t{ PixelFormat(DRM_FORMAT_SGBRG10, IPU3_FORMAT_MOD_PACKED), {\n> +\t\t.bitsPerSample = 16,\n> +\t\t.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },\n> +\t\t.packScanline = packScanlineIPU3,\n> +\t} },\n> +\t{ PixelFormat(DRM_FORMAT_SGRBG10, IPU3_FORMAT_MOD_PACKED), {\n> +\t\t.bitsPerSample = 16,\n> +\t\t.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },\n> +\t\t.packScanline = packScanlineIPU3,\n> +\t} },\n> +\t{ PixelFormat(DRM_FORMAT_SRGGB10, IPU3_FORMAT_MOD_PACKED), {\n> +\t\t.bitsPerSample = 16,\n> +\t\t.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },\n> +\t\t.packScanline = packScanlineIPU3,\n> +\t} },\n\nDepending on which patch gets merged first, you need .thumbScanline here\ntoo :-)\n\n> };\n> \n> int DNGWriter::write(const char *filename, const Camera *camera,","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A0A88603F1\n\tfor ;\n\tSun, 3 May 2020 02:33:08 +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 1B01B304;\n\tSun, 3 May 2020 02:33:08 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"SC+L2VMe\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1588465988;\n\tbh=n4FGH9/3wiW0qyrqazEas3e+z8cWib0YtPRXR2wnIVM=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=SC+L2VMeHZYi/qk9uxhEEDC7jeSktVLJDCBxns6LZL2iW9Fc/WxPgYloN1cZvYbtJ\n\tszRiW/JrnPYw2Xkw/8KFuiocgdb4fPGXExz5ZmUGPaLhRnzbtuzQ92B/0k9KXelimI\n\tF8LLANT/nOz1JcBMHFONGfz8b53RcZfewsubiF/E=","Date":"Sun, 3 May 2020 03:33:04 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200503003304.GD25636@pendragon.ideasonboard.com>","References":"<20200503002755.1367555-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200503002755.1367555-1-niklas.soderlund@ragnatech.se>","Subject":"Re: [libcamera-devel] [PATCH] qcam: dng_writer: Add support for\n\tIPU3 Bayer 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","X-List-Received-Date":"Sun, 03 May 2020 00:33:08 -0000"}}]