From patchwork Thu Jun 27 12:51:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 20427 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C45EEBD87C for ; Thu, 27 Jun 2024 12:53:44 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 751AE62C9D; Thu, 27 Jun 2024 14:53:44 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="wBrMEbmN"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3F87762C98 for ; Thu, 27 Jun 2024 14:53:42 +0200 (CEST) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:6248:8b4b:42bc:2b84]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 61F0E2E0; Thu, 27 Jun 2024 14:53:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1719492798; bh=YdteIK+RlX3MCfQxROWXtSR7PlZy6FqL60WS/CdvUsI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wBrMEbmNF3zzLSw7adUwBZAmbYIIJSG2pM3HyFfPfQtCExDYaMWMVnAo5ijS+tK2s za66TgZCA+X/ATmEs8W1DdR+mxUkRcAdSQmSFlvalJBlKcB2V7dZFOD8ZxqbZRc6x1 paVhGMOoXksW3a1cRo885nlt313LBdcBME1t3pA8= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug Subject: [PATCH 2/3] apps: common: dng_writer: Add thumbnail scanline function for RawXX Date: Thu, 27 Jun 2024 14:51:10 +0200 Message-ID: <20240627125310.2533622-3-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240627125310.2533622-1-stefan.klug@ideasonboard.com> References: <20240627125310.2533622-1-stefan.klug@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a thumbnail function for raw formats that are 16bit aligned. This is needed for the upcoming RAW10 and RAW12 implemntation. Use the new function for RAW16 as the thumbScanlineRawXX_CSI2P produces incorrect results for that format (it averages over adjacent bytes, which works for the CSI formats). Signed-off-by: Stefan Klug Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/apps/common/dng_writer.cpp | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/apps/common/dng_writer.cpp b/src/apps/common/dng_writer.cpp index 88b225d3e099..2cb320ff327b 100644 --- a/src/apps/common/dng_writer.cpp +++ b/src/apps/common/dng_writer.cpp @@ -144,6 +144,30 @@ void packScanlineRaw16(void *output, const void *input, unsigned int width) std::copy(in, in + width, out); } +/* Thumbnail function for raw data aligned to 16bit words */ +void thumbScanlineRawXX(const FormatInfo &info, void *output, + const void *input, unsigned int width, + unsigned int stride) +{ + const uint16_t *in = static_cast(input); + const uint16_t *in2 = static_cast(input) + stride / 2; + uint8_t *out = static_cast(output); + + /* shift down to 8 */ + unsigned int shift = info.bitsPerSample - 8; + + /* simple averaging that produces grey RGB values */ + for (unsigned int x = 0; x < width; x++) { + uint16_t value = (in[0] + in[1] + in2[0] + in2[1]) >> 2; + value = value >> shift; + *out++ = value; + *out++ = value; + *out++ = value; + in += 16; + in2 += 16; + } +} + void packScanlineRaw10_CSI2P(void *output, const void *input, unsigned int width) { const uint8_t *in = static_cast(input); @@ -321,25 +345,25 @@ const std::map formatInfo = { .bitsPerSample = 16, .pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed }, .packScanline = packScanlineRaw16, - .thumbScanline = thumbScanlineRawXX_CSI2P, + .thumbScanline = thumbScanlineRawXX, } }, { formats::SGBRG16, { .bitsPerSample = 16, .pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen }, .packScanline = packScanlineRaw16, - .thumbScanline = thumbScanlineRawXX_CSI2P, + .thumbScanline = thumbScanlineRawXX, } }, { formats::SGRBG16, { .bitsPerSample = 16, .pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen }, .packScanline = packScanlineRaw16, - .thumbScanline = thumbScanlineRawXX_CSI2P, + .thumbScanline = thumbScanlineRawXX, } }, { formats::SRGGB16, { .bitsPerSample = 16, .pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue }, .packScanline = packScanlineRaw16, - .thumbScanline = thumbScanlineRawXX_CSI2P, + .thumbScanline = thumbScanlineRawXX, } }, { formats::SBGGR10_CSI2P, { .bitsPerSample = 10,