{"id":3974,"url":"https://patchwork.libcamera.org/api/1.1/patches/3974/?format=json","web_url":"https://patchwork.libcamera.org/patch/3974/","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-2-niklas.soderlund@ragnatech.se>","date":"2020-06-06T15:50:38","name":"[libcamera-devel,1/2] qcam: dng_writer: Make thumbnail downscaling format dependent","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"acc90bb5b24baf883caf4a7b8e5f86a034810948","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/3974/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/3974/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3974/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 B7A3A61167\n\tfor ;\n\tSat, 6 Jun 2020 17:50:47 +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 7b3444b2-a80d-11ea-933e-005056917a89;\n\tSat, 06 Jun 2020 17:50:44 +0200 (CEST)"],"X-Halon-ID":"7b3444b2-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:38 +0200","Message-Id":"<20200606155039.1874519-2-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 1/2] qcam: dng_writer: Make thumbnail\n\tdownscaling format dependent","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:48 -0000"},"content":"Some RAW formats are easier to generate thumbnails for if the\ndownscaling factor for the thumbnail is configurable. Prepare for\naddition of such formats by allowing the downscale to differ between\nformats.\n\nSigned-off-by: Niklas Söderlund \n---\n src/qcam/dng_writer.cpp | 27 +++++++++++++++++++--------\n 1 file changed, 19 insertions(+), 8 deletions(-)","diff":"diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp\nindex cbd8bed3e6d02269..9435eeec5438f158 100644\n--- a/src/qcam/dng_writer.cpp\n+++ b/src/qcam/dng_writer.cpp\n@@ -28,6 +28,7 @@ struct FormatInfo {\n \tCFAPatternColour pattern[4];\n \tvoid (*packScanline)(void *output, const void *input,\n \t\t\t unsigned int width);\n+\tunsigned int thumbDownscaleFactor;\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@@ -87,48 +88,56 @@ static const std::map formatInfo = {\n \t\t.bitsPerSample = 10,\n \t\t.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },\n \t\t.packScanline = packScanlineSBGGR10P,\n+\t\t.thumbDownscaleFactor = 16,\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.thumbDownscaleFactor = 16,\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.thumbDownscaleFactor = 16,\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.thumbDownscaleFactor = 16,\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.thumbDownscaleFactor = 16,\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.thumbDownscaleFactor = 16,\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.thumbDownscaleFactor = 16,\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.thumbDownscaleFactor = 16,\n \t\t.thumbScanline = thumbScanlineSBGGRxxP,\n \t} },\n };\n@@ -178,13 +187,14 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \tTIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);\n \n \t/*\n-\t * Thumbnail-specific tags. The thumbnail is stored as an RGB image\n-\t * with 1/16 of the raw image resolution. Greyscale would save space,\n-\t * but doesn't seem well supported by RawTherapee.\n+\t * Thumbnail-specific tags. The thumbnail is stored as an RGB image with\n+\t * format dependet downscaling of the raw image resolution. Greyscale\n+\t * would save space, but doesn't seem well supported by RawTherapee.\n \t */\n+\tconst unsigned int thumbScale = info->thumbDownscaleFactor;\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_IMAGEWIDTH, config.size.width / thumbScale);\n+\tTIFFSetField(tif, TIFFTAG_IMAGELENGTH, config.size.height / thumbScale);\n \tTIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);\n \tTIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE);\n \tTIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);\n@@ -202,9 +212,10 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \n \t/* Write the thumbnail. */\n \tconst uint8_t *row = static_cast(data);\n-\tfor (unsigned int y = 0; y < config.size.height / 16; y++) {\n+\tfor (unsigned int y = 0; y < config.size.height / thumbScale; y++) {\n \t\tinfo->thumbScanline(*info, &scanline, row,\n-\t\t\t\t config.size.width / 16, config.stride);\n+\t\t\t\t config.size.width / thumbScale,\n+\t\t\t\t config.stride);\n \n \t\tif (TIFFWriteScanline(tif, &scanline, y, 0) != 1) {\n \t\t\tstd::cerr << \"Failed to write thumbnail scanline\"\n@@ -213,7 +224,7 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \t\t\treturn -EINVAL;\n \t\t}\n \n-\t\trow += config.stride * 16;\n+\t\trow += config.stride * thumbScale;\n \t}\n \n \tTIFFWriteDirectory(tif);\n","prefixes":["libcamera-devel","1/2"]}