[{"id":4727,"web_url":"https://patchwork.libcamera.org/comment/4727/","msgid":"<20200503010822.GC3012491@oden.dyn.berto.se>","date":"2020-05-03T01:08:22","subject":"Re: [libcamera-devel] [PATCH 3/5] qcam: dng_writer: Output thumbnail","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your clever work!\n\nOn 2020-05-03 01:57:02 +0300, Laurent Pinchart wrote:\n> Generate a greyscale, 1/16 resolution thumbnail and add it to the DNG\n> file. This requires shuffling the RAW image generation as the thumbnail\n> has to be stored in the main IFD as per the DNG and TIFF/EP\n> specifications.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\n> ---\n>  src/qcam/dng_writer.cpp | 126 +++++++++++++++++++++++++++++++++++-----\n>  1 file changed, 111 insertions(+), 15 deletions(-)\n> \n> diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp\n> index d5270323abd4..e55985ba86e7 100644\n> --- a/src/qcam/dng_writer.cpp\n> +++ b/src/qcam/dng_writer.cpp\n> @@ -25,6 +25,9 @@ struct FormatInfo {\n>  \tCFAPatternColour pattern[4];\n>  \tvoid (*packScanline)(void *output, const void *input,\n>  \t\t\t     unsigned int width);\n> +\tvoid (*thumbScanline)(const FormatInfo &info, void *output,\n> +\t\t\t      const void *input, unsigned int width,\n> +\t\t\t      unsigned int stride);\n>  };\n>  \n>  void packScanlineSBGGR10P(void *output, const void *input, unsigned int width)\n> @@ -57,46 +60,70 @@ void packScanlineSBGGR12P(void *output, const void *input, unsigned int width)\n>  \t}\n>  }\n>  \n> +void thumbScanlineSBGGRxxP(const FormatInfo &info, void *output,\n> +\t\t\t   const void *input, unsigned int width,\n> +\t\t\t   unsigned int stride)\n> +{\n> +\tconst uint8_t *in = static_cast<const uint8_t *>(input);\n> +\tuint8_t *out = static_cast<uint8_t *>(output);\n> +\n> +\t/* Number of bytes corresponding to 16 pixels. */\n> +\tunsigned int skip = info.bitsPerSample * 16 / 8;\n> +\n> +\tfor (unsigned int x = 0; x < width; x++) {\n> +\t\t*out++ = (in[0] + in[1] + in[stride] + in[stride + 1]) >> 2;\n> +\t\tin += skip;\n> +\t}\n> +}\n> +\n>  static const std::map<PixelFormat, FormatInfo> formatInfo = {\n>  \t{ PixelFormat(DRM_FORMAT_SBGGR10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n>  \t\t.bitsPerSample = 10,\n>  \t\t.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },\n>  \t\t.packScanline = packScanlineSBGGR10P,\n> +\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n>  \t} },\n>  \t{ PixelFormat(DRM_FORMAT_SGBRG10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n>  \t\t.bitsPerSample = 10,\n>  \t\t.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },\n>  \t\t.packScanline = packScanlineSBGGR10P,\n> +\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n>  \t} },\n>  \t{ PixelFormat(DRM_FORMAT_SGRBG10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n>  \t\t.bitsPerSample = 10,\n>  \t\t.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },\n>  \t\t.packScanline = packScanlineSBGGR10P,\n> +\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n>  \t} },\n>  \t{ PixelFormat(DRM_FORMAT_SRGGB10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n>  \t\t.bitsPerSample = 10,\n>  \t\t.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },\n>  \t\t.packScanline = packScanlineSBGGR10P,\n> +\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n>  \t} },\n>  \t{ PixelFormat(DRM_FORMAT_SBGGR12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n>  \t\t.bitsPerSample = 12,\n>  \t\t.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },\n>  \t\t.packScanline = packScanlineSBGGR12P,\n> +\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n>  \t} },\n>  \t{ PixelFormat(DRM_FORMAT_SGBRG12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n>  \t\t.bitsPerSample = 12,\n>  \t\t.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },\n>  \t\t.packScanline = packScanlineSBGGR12P,\n> +\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n>  \t} },\n>  \t{ PixelFormat(DRM_FORMAT_SGRBG12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n>  \t\t.bitsPerSample = 12,\n>  \t\t.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },\n>  \t\t.packScanline = packScanlineSBGGR12P,\n> +\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n>  \t} },\n>  \t{ PixelFormat(DRM_FORMAT_SRGGB12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n>  \t\t.bitsPerSample = 12,\n>  \t\t.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },\n>  \t\t.packScanline = packScanlineSBGGR12P,\n> +\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n>  \t} },\n>  };\n>  \n> @@ -118,40 +145,101 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n>  \t\treturn -EINVAL;\n>  \t}\n>  \n> +\t/*\n> +\t * Scanline buffer, has to be large enough to store both a RAW scanline\n> +\t * or a thumbnail scanline. The latter will always be much smaller than\n> +\t * the former as we downscale by 16 in both directions.\n> +\t */\n> +\tuint8_t scanline[(config.size.width * info->bitsPerSample + 7) / 8];\n> +\n> +\ttoff_t rawIFDOffset = 0;\n> +\n> +\t/*\n> +\t * Start with a thumbnail in IFD 0 for compatibility with TIFF baseline\n> +\t * readers, as required by the TIFF/EP specification. Tags that apply to\n> +\t * the whole file are stored here.\n> +\t */\n>  \tconst uint8_t version[] = { 1, 2, 0, 0 };\n> -\tconst uint16_t cfa_repeatpatterndim[] = { 2, 2 };\n> +\n>  \tTIFFSetField(tif, TIFFTAG_DNGVERSION, version);\n>  \tTIFFSetField(tif, TIFFTAG_DNGBACKWARDVERSION, version);\n> -\tTIFFSetField(tif, TIFFTAG_SUBFILETYPE, 0);\n> -\tTIFFSetField(tif, TIFFTAG_IMAGEWIDTH, config.size.width);\n> -\tTIFFSetField(tif, TIFFTAG_IMAGELENGTH, config.size.height);\n> -\tTIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, info->bitsPerSample);\n> -\tTIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE);\n> -\tTIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_CFA);\n>  \tTIFFSetField(tif, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB);\n>  \tTIFFSetField(tif, TIFFTAG_MAKE, \"libcamera\");\n>  \tTIFFSetField(tif, TIFFTAG_MODEL, camera->name().c_str());\n>  \tTIFFSetField(tif, TIFFTAG_UNIQUECAMERAMODEL, camera->name().c_str());\n> -\tTIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);\n> -\tTIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1);\n> -\tTIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);\n>  \tTIFFSetField(tif, TIFFTAG_SOFTWARE, \"qcam\");\n> +\tTIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);\n> +\n> +\t/*\n> +\t * Thumbnail-specific tags. The thumbnail is stored as a greyscale image\n> +\t * with 1/16 of the raw image resolution.\n> +\t */\n> +\tTIFFSetField(tif, TIFFTAG_SUBFILETYPE, FILETYPE_REDUCEDIMAGE);\n> +\tTIFFSetField(tif, TIFFTAG_IMAGEWIDTH, config.size.width / 16);\n> +\tTIFFSetField(tif, TIFFTAG_IMAGELENGTH, config.size.height / 16);\n> +\tTIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);\n> +\tTIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE);\n> +\tTIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK);\n> +\tTIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1);\n> +\tTIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);\n>  \tTIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);\n> -\tTIFFSetField(tif, TIFFTAG_CFAREPEATPATTERNDIM, cfa_repeatpatterndim);\n> +\n> +\t/*\n> +\t * Reserve space for the SubIFD tag, pointing to the IFD for the raw\n> +\t * image. The real offset will be set later.\n> +\t */\n> +\tTIFFSetField(tif, TIFFTAG_SUBIFD, 1, &rawIFDOffset);\n> +\n> +\t/* Write the thumbnail. */\n> +\tconst uint8_t *row = static_cast<const uint8_t *>(data);\n> +\tfor (unsigned int y = 0; y < config.size.height / 16; y++) {\n> +\t\tinfo->thumbScanline(*info, &scanline, row,\n> +\t\t\t\t    config.size.width / 16, config.stride);\n> +\n> +\t\tif (TIFFWriteScanline(tif, &scanline, y, 0) != 1) {\n> +\t\t\tstd::cerr << \"Failed to write thumbnail scanline\"\n> +\t\t\t\t  << std::endl;\n> +\t\t\tTIFFClose(tif);\n> +\t\t\treturn -EINVAL;\n> +\t\t}\n> +\n> +\t\trow += config.stride * 16;\n> +\t}\n> +\n> +\tTIFFWriteDirectory(tif);\n> +\n> +\t/* Create a new IFD for the RAW image. */\n> +\tconst uint16_t cfaRepeatPatternDim[] = { 2, 2 };\n> +\tconst uint8_t cfaPlaneColor[] = {\n> +\t\tCFAPatternRed,\n> +\t\tCFAPatternGreen,\n> +\t\tCFAPatternBlue\n> +\t};\n> +\n> +\tTIFFSetField(tif, TIFFTAG_SUBFILETYPE, 0);\n> +\tTIFFSetField(tif, TIFFTAG_IMAGEWIDTH, config.size.width);\n> +\tTIFFSetField(tif, TIFFTAG_IMAGELENGTH, config.size.height);\n> +\tTIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, info->bitsPerSample);\n> +\tTIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE);\n> +\tTIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_CFA);\n> +\tTIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1);\n> +\tTIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);\n> +\tTIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);\n> +\tTIFFSetField(tif, TIFFTAG_CFAREPEATPATTERNDIM, cfaRepeatPatternDim);\n>  \tTIFFSetField(tif, TIFFTAG_CFAPATTERN, info->pattern);\n> -\tTIFFSetField(tif, TIFFTAG_CFAPLANECOLOR, 3, \"\\00\\01\\02\");\n> +\tTIFFSetField(tif, TIFFTAG_CFAPLANECOLOR, 3, cfaPlaneColor);\n>  \tTIFFSetField(tif, TIFFTAG_CFALAYOUT, 1);\n>  \n>  \t/* \\todo Add more EXIF fields to output. */\n>  \n>  \t/* Write RAW content. */\n> -\tconst uint8_t *row = static_cast<const uint8_t *>(data);\n> -\tuint8_t scanline[(config.size.width * info->bitsPerSample + 7) / 8];\n> +\trow = static_cast<const uint8_t *>(data);\n>  \tfor (unsigned int y = 0; y < config.size.height; y++) {\n>  \t\tinfo->packScanline(&scanline, row, config.size.width);\n>  \n>  \t\tif (TIFFWriteScanline(tif, &scanline, y, 0) != 1) {\n> -\t\t\tstd::cerr << \"Failed to write scanline\" << std::endl;\n> +\t\t\tstd::cerr << \"Failed to write RAW scanline\"\n> +\t\t\t\t  << std::endl;\n>  \t\t\tTIFFClose(tif);\n>  \t\t\treturn -EINVAL;\n>  \t\t}\n> @@ -159,6 +247,14 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n>  \t\trow += config.stride;\n>  \t}\n>  \n> +\t/* Checkpoint the IFD to retrieve its offset, and write it out. */\n> +\tTIFFCheckpointDirectory(tif);\n> +\trawIFDOffset = TIFFCurrentDirOffset(tif);\n> +\tTIFFWriteDirectory(tif);\n> +\n> +\t/* Update the IFD offsets and close the file. */\n> +\tTIFFSetDirectory(tif, 0);\n> +\tTIFFSetField(tif, TIFFTAG_SUBIFD, 1, &rawIFDOffset);\n>  \tTIFFWriteDirectory(tif);\n>  \n>  \tTIFFClose(tif);\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<niklas.soderlund@ragnatech.se>","Received":["from mail-lf1-x144.google.com (mail-lf1-x144.google.com\n\t[IPv6:2a00:1450:4864:20::144])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AF860603F1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun,  3 May 2020 03:08:24 +0200 (CEST)","by mail-lf1-x144.google.com with SMTP id d25so6723962lfi.11\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 02 May 2020 18:08:24 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tr12sm4782922ljc.12.2020.05.02.18.08.23\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 02 May 2020 18:08:23 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com header.b=\"dPbZ4Pda\"; \n\tdkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=BVY3XMuaKp8a5DlRtUtWyvIYlLVv6jSPXlImzNhx4Sw=;\n\tb=dPbZ4PdarXLafCa4Clp2v4prOUSDyeefqeVrQHR2+wZ1zjKBPEHZP6R70poCUcNDr2\n\tJ+C7RypZPWg9J5kgYYIzyMPXXyAz3vRAPn+zsZpUNQhNeVMaq7jXNFBaLqG0VQ+o8ZpR\n\tSOcRX5up5HDNaFJ2w7jOTujN6+kIi5/M8XjNj61Cvm3zglAZK5Bc8bmzxFPVDvXfcRRR\n\tulH2mCTHt8r3GdNScltYUHVL1jLPP290kW1pSWyQfb0D9sytxEBSOnkZgTrqYN6htzTt\n\ts0aZV8h+d0OZffgiH02zyFZvLw7DjYIJtZ27ArN775UXeRmoO1RTgFbjlwyuAPQ6A+23\n\tJukg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=BVY3XMuaKp8a5DlRtUtWyvIYlLVv6jSPXlImzNhx4Sw=;\n\tb=qz3JBPxOWTWGw8/Gjor7GYuWAngbLfh7DBuaGnGEas8m5w26tikN4CRix7hdgr2BF2\n\tipnya7w0ckBCPo2d7VRtuByWfcEJSh/SCYs5JGjB6iRQHvKlIAl74ueeic5LJ+sQ3C1M\n\tOKgvTBbeSb/CXV36yMYPGZcVY99dRpdoXoA2/U3f1YwQznb1tI5iA83tYASUHldcYUQx\n\tMUwDogIlEjgSg23HxNDylrKbuhG3ilECBzzNRluGGTngMY1olciGt4iCzXbX4grt7Hfz\n\trH5oeXQCwmXiJC9piHWMi2PwH9lZErClc7cTDZwWMsuVVMqoxAdkm0Ws60jKAGp1KiMT\n\tASVA==","X-Gm-Message-State":"AGi0Pua0SXGQ5Mya6+hd0C096ql7LMeGYPccLLnZvYSKXvM4YNkUiJ48\n\tGS5rSm6Mi1aua6jrddPH0/f5sQ==","X-Google-Smtp-Source":"APiQypIkLwmg586P5JXeiej7iPCNDQxtPSvUTT5D0VuE39GlpkNqKXX79b7BdZy1nEdD0JYnNUH17g==","X-Received":"by 2002:a19:7418:: with SMTP id v24mr215072lfe.15.1588468103903; \n\tSat, 02 May 2020 18:08:23 -0700 (PDT)","Date":"Sun, 3 May 2020 03:08:22 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200503010822.GC3012491@oden.dyn.berto.se>","References":"<20200502225704.2911-1-laurent.pinchart@ideasonboard.com>\n\t<20200502225704.2911-4-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200502225704.2911-4-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 3/5] qcam: dng_writer: Output thumbnail","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Sun, 03 May 2020 01:08:24 -0000"}}]