{"id":3975,"url":"https://patchwork.libcamera.org/api/1.1/patches/3975/?format=json","web_url":"https://patchwork.libcamera.org/patch/3975/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200606155039.1874519-3-niklas.soderlund@ragnatech.se>","date":"2020-06-06T15:50:39","name":"[libcamera-devel,2/2] qcam: dng_writer: Add support for IPU3 Bayer formats","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"47e79f1bd4c6c60128ae33cce24f91e0ac94d3fd","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3975/mbox/","series":[{"id":965,"url":"https://patchwork.libcamera.org/api/1.1/series/965/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=965","date":"2020-06-06T15:50:37","name":"qcam: dng_writer: Add support for IPU3 Bayer formats","version":1,"mbox":"https://patchwork.libcamera.org/series/965/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3975/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3975/checks/","tags":{},"headers":{"Return-Path":"","Received":["from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 53A4861167\n\tfor ;\n\tSat, 6 Jun 2020 17:50:48 +0200 (CEST)","from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 7bb77386-a80d-11ea-933e-005056917a89;\n\tSat, 06 Jun 2020 17:50:45 +0200 (CEST)"],"X-Halon-ID":"7bb77386-a80d-11ea-933e-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 6 Jun 2020 17:50:39 +0200","Message-Id":"<20200606155039.1874519-3-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.26.2","In-Reply-To":"<20200606155039.1874519-1-niklas.soderlund@ragnatech.se>","References":"<20200606155039.1874519-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/2] 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":"Sat, 06 Jun 2020 15:50:49 -0000"},"content":"Add support for the Bayer formats produced on the IPU3. The format uses\na memory layout that is hard to repack and keep the 10-bit sample size,\ntherefore scale the samples to 16-bit when creating the scanlines.\n\nSigned-off-by: Niklas Söderlund \n---\n src/qcam/dng_writer.cpp | 77 +++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 77 insertions(+)","diff":"diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp\nindex 9435eeec5438f158..8c128041c37f26fe 100644\n--- a/src/qcam/dng_writer.cpp\n+++ b/src/qcam/dng_writer.cpp\n@@ -83,6 +83,55 @@ void thumbScanlineSBGGRxxP(const FormatInfo &info, void *output,\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+\t * it as 10-bits without gaps.\n+\t *\n+\t * \\todo Improve packig to keep the 10-bit sample size.\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+void thumbScanlineIPU3(const FormatInfo &info, void *output,\n+\t\t const void *input, unsigned int width,\n+\t\t unsigned int stride)\n+{\n+\tconst uint8_t *in = static_cast(input);\n+\tuint8_t *out = static_cast(output);\n+\n+\t/* Number of bytes corresponding to 25 pixels. */\n+\tunsigned int skip = 32;\n+\n+\tfor (unsigned int x = 0; x < width; x++) {\n+\t\tuint8_t val1 = ((in[1] & 0x02) << 8 | in[0]) << 6;\n+\t\tuint8_t val2 = ((in[2] & 0x0f) << 6 | in[1] >> 2) << 6;\n+\t\tuint8_t val3 = ((in[stride + 1] & 0x02) << 8 | in[stride + 0]) << 6;\n+\t\tuint8_t val4 = ((in[stride + 2] & 0x0f) << 6 | in[stride + 1] >> 2) << 6;\n+\t\tuint8_t value = (val1 + val2 + val3 + val4) >> 2;\n+\n+\t\t*out++ = value;\n+\t\t*out++ = value;\n+\t\t*out++ = value;\n+\t\tin += skip;\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@@ -140,6 +189,34 @@ static const std::map formatInfo = {\n \t\t.thumbDownscaleFactor = 16,\n \t\t.thumbScanline = thumbScanlineSBGGRxxP,\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\t.thumbDownscaleFactor = 25,\n+\t\t.thumbScanline = thumbScanlineIPU3,\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\t.thumbDownscaleFactor = 25,\n+\t\t.thumbScanline = thumbScanlineIPU3,\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\t.thumbDownscaleFactor = 25,\n+\t\t.thumbScanline = thumbScanlineIPU3,\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\t.thumbDownscaleFactor = 25,\n+\t\t.thumbScanline = thumbScanlineIPU3,\n+\t} },\n };\n \n int DNGWriter::write(const char *filename, const Camera *camera,\n","prefixes":["libcamera-devel","2/2"]}