[{"id":30165,"web_url":"https://patchwork.libcamera.org/comment/30165/","msgid":"<fb0b7e4e-7ac3-42d2-88db-c721a10e0ed1@ideasonboard.com>","date":"2024-07-01T04:47:31","subject":"Re: [PATCH 2/2] apps: common: dng_writer: Fix RAW10 and RAW12\n\tpacking on BE machines","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"content":"Hi Laurent,\n\nThank you for the patch.\n\nOn 29/06/24 3:05 am, Laurent Pinchart wrote:\n> The 16-bit padded raw 10 and raw 12 formats are stored in memory in\n> little endian order, regardless of the machine's endianness. Read pixel\n> data as uint8_t values and hardcode bit shifting to little endian to fix\n> scanline packing.\n>\n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nReviewed-by: Umang Jain <umang.jain@ideasonboard.com>\n\n> ---\n>   src/apps/common/dng_writer.cpp | 24 ++++++++++++------------\n>   1 file changed, 12 insertions(+), 12 deletions(-)\n>\n> diff --git a/src/apps/common/dng_writer.cpp b/src/apps/common/dng_writer.cpp\n> index 50db5eb33c83..355433b08d68 100644\n> --- a/src/apps/common/dng_writer.cpp\n> +++ b/src/apps/common/dng_writer.cpp\n> @@ -139,29 +139,29 @@ void packScanlineRaw8(void *output, const void *input, unsigned int width)\n>   \n>   void packScanlineRaw10(void *output, const void *input, unsigned int width)\n>   {\n> -\tconst uint16_t *in = static_cast<const uint16_t *>(input);\n> +\tconst uint8_t *in = static_cast<const uint8_t *>(input);\n>   \tuint8_t *out = static_cast<uint8_t *>(output);\n>   \n>   \tfor (unsigned int i = 0; i < width; i += 4) {\n> -\t\t*out++ = (in[0] & 0x3fc) >> 2;\n> -\t\t*out++ = (in[0] & 0x003) << 6 | (in[1] & 0x3f0) >> 4;\n> -\t\t*out++ = (in[1] & 0x00f) << 4 | (in[2] & 0x3c0) >> 6;\n> -\t\t*out++ = (in[2] & 0x03f) << 2 | (in[3] & 0x300) >> 8;\n> -\t\t*out++ = (in[3] & 0x0ff);\n> -\t\tin += 4;\n> +\t\t*out++ = in[1] << 6 | in[0] >> 2;\n> +\t\t*out++ = in[0] << 6 | (in[3] & 0x03) << 4 | in[2] >> 4;\n> +\t\t*out++ = in[2] << 4 | (in[5] & 0x03) << 2 | in[4] >> 6;\n> +\t\t*out++ = in[4] << 2 | (in[7] & 0x03) << 0;\n> +\t\t*out++ = in[6];\n> +\t\tin += 8;\n>   \t}\n>   }\n>   \n>   void packScanlineRaw12(void *output, const void *input, unsigned int width)\n>   {\n> -\tconst uint16_t *in = static_cast<const uint16_t *>(input);\n> +\tconst uint8_t *in = static_cast<const uint8_t *>(input);\n>   \tuint8_t *out = static_cast<uint8_t *>(output);\n>   \n>   \tfor (unsigned int i = 0; i < width; i += 2) {\n> -\t\t*out++ = (in[0] & 0xff0) >> 4;\n> -\t\t*out++ = (in[0] & 0x00f) << 4 | (in[1] & 0xf00) >> 8;\n> -\t\t*out++ = (in[1] & 0x0ff);\n> -\t\tin += 2;\n> +\t\t*out++ = in[1] << 4 | in[0] >> 4;\n> +\t\t*out++ = in[0] << 4 | (in[3] & 0x0f);\n> +\t\t*out++ = in[2];\n> +\t\tin += 4;\n>   \t}\n>   }\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 9C5C3BD87C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  1 Jul 2024 04:47:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 631E162C99;\n\tMon,  1 Jul 2024 06:47:39 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2AE0F619C3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  1 Jul 2024 06:47:37 +0200 (CEST)","from [IPV6:2405:201:2015:f873:55d7:c02e:b2eb:ee3f] (unknown\n\t[IPv6:2405:201:2015:f873:55d7:c02e:b2eb:ee3f])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DD485496;\n\tMon,  1 Jul 2024 06:47:09 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"EjtKEd9/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719809230;\n\tbh=gSzjS9Nmss5Xj5rM9N/ezxcV8EVNnMmYBwijk9IDTO4=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=EjtKEd9/9uJLFcRY4d2dEAZnaa/sRm4AkIaoMS547WvSqNWM0HmcXZ7S5Lqm/4F5f\n\twcIk2tJca0BSWNsviFd73hDQ0IIEFeuvKU7lkuhncQCZgRspHTp6K/07kJqoRyzjfJ\n\tJsBAVDCKPSGzJKdFh/b3YHQUHlPkRZvdGt1iu8XA=","Message-ID":"<fb0b7e4e-7ac3-42d2-88db-c721a10e0ed1@ideasonboard.com>","Date":"Mon, 1 Jul 2024 10:17:31 +0530","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH 2/2] apps: common: dng_writer: Fix RAW10 and RAW12\n\tpacking on BE machines","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20240628213535.6906-1-laurent.pinchart@ideasonboard.com>\n\t<20240628213535.6906-3-laurent.pinchart@ideasonboard.com>","Content-Language":"en-US","From":"Umang Jain <umang.jain@ideasonboard.com>","In-Reply-To":"<20240628213535.6906-3-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"7bit","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>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":30168,"web_url":"https://patchwork.libcamera.org/comment/30168/","msgid":"<ofohgfecpjsa56bh5rjy6lq5zehrolvlb75lrlzi7bnhujjgqg@4krs6iispjse>","date":"2024-07-01T07:48:21","subject":"Re: [PATCH 2/2] apps: common: dng_writer: Fix RAW10 and RAW12\n\tpacking on BE machines","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/people/184/","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"content":"Hi Laurent,\n\nThank you for the patch.\n\nOn Sat, Jun 29, 2024 at 12:35:35AM +0300, Laurent Pinchart wrote:\n> The 16-bit padded raw 10 and raw 12 formats are stored in memory in\n> little endian order, regardless of the machine's endianness. Read pixel\n> data as uint8_t values and hardcode bit shifting to little endian to fix\n> scanline packing.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nYep, now it's correct :-)\n\nReviewed-by: Stefan Klug <stefan.klug@ideasonboard.com> \n\n> ---\n>  src/apps/common/dng_writer.cpp | 24 ++++++++++++------------\n>  1 file changed, 12 insertions(+), 12 deletions(-)\n> \n> diff --git a/src/apps/common/dng_writer.cpp b/src/apps/common/dng_writer.cpp\n> index 50db5eb33c83..355433b08d68 100644\n> --- a/src/apps/common/dng_writer.cpp\n> +++ b/src/apps/common/dng_writer.cpp\n> @@ -139,29 +139,29 @@ void packScanlineRaw8(void *output, const void *input, unsigned int width)\n>  \n>  void packScanlineRaw10(void *output, const void *input, unsigned int width)\n>  {\n> -\tconst uint16_t *in = static_cast<const uint16_t *>(input);\n> +\tconst uint8_t *in = static_cast<const uint8_t *>(input);\n>  \tuint8_t *out = static_cast<uint8_t *>(output);\n>  \n>  \tfor (unsigned int i = 0; i < width; i += 4) {\n> -\t\t*out++ = (in[0] & 0x3fc) >> 2;\n> -\t\t*out++ = (in[0] & 0x003) << 6 | (in[1] & 0x3f0) >> 4;\n> -\t\t*out++ = (in[1] & 0x00f) << 4 | (in[2] & 0x3c0) >> 6;\n> -\t\t*out++ = (in[2] & 0x03f) << 2 | (in[3] & 0x300) >> 8;\n> -\t\t*out++ = (in[3] & 0x0ff);\n> -\t\tin += 4;\n> +\t\t*out++ = in[1] << 6 | in[0] >> 2;\n> +\t\t*out++ = in[0] << 6 | (in[3] & 0x03) << 4 | in[2] >> 4;\n> +\t\t*out++ = in[2] << 4 | (in[5] & 0x03) << 2 | in[4] >> 6;\n> +\t\t*out++ = in[4] << 2 | (in[7] & 0x03) << 0;\n> +\t\t*out++ = in[6];\n> +\t\tin += 8;\n>  \t}\n>  }\n>  \n>  void packScanlineRaw12(void *output, const void *input, unsigned int width)\n>  {\n> -\tconst uint16_t *in = static_cast<const uint16_t *>(input);\n> +\tconst uint8_t *in = static_cast<const uint8_t *>(input);\n>  \tuint8_t *out = static_cast<uint8_t *>(output);\n>  \n>  \tfor (unsigned int i = 0; i < width; i += 2) {\n> -\t\t*out++ = (in[0] & 0xff0) >> 4;\n> -\t\t*out++ = (in[0] & 0x00f) << 4 | (in[1] & 0xf00) >> 8;\n> -\t\t*out++ = (in[1] & 0x0ff);\n> -\t\tin += 2;\n> +\t\t*out++ = in[1] << 4 | in[0] >> 4;\n> +\t\t*out++ = in[0] << 4 | (in[3] & 0x0f);\n> +\t\t*out++ = in[2];\n> +\t\tin += 4;\n>  \t}\n>  }\n>  \n> -- \n> Regards,\n> \n> Laurent Pinchart\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 0E662BEFBE\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  1 Jul 2024 07:48:26 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0057C619C9;\n\tMon,  1 Jul 2024 09:48:24 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BF8E7619C9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  1 Jul 2024 09:48:23 +0200 (CEST)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:89b2:f6c7:b29b:4e5c])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E10BE289;\n\tMon,  1 Jul 2024 09:47:56 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Wj4ixm2w\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719820077;\n\tbh=1gAdfm16t0VIve//GQxaJtkC0uT4ACZzQXO665cQJS8=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Wj4ixm2wRZxI+nv3qdaDGLwZvJcJXuhPcw9B8mM4JmYQLAQW7qTzh5dLhHQi7g/m1\n\t+Dd/Lf+crIoiDeXdPU+WQulAfu1oP/etUWfxfdq4NOiaZV+CojPmZBsr1VLkiXNrlB\n\tgsJ5CJwzyKbrwSExDlBu5AyLSXnZojoPDaoxpUME=","Date":"Mon, 1 Jul 2024 09:48:21 +0200","From":"Stefan Klug <stefan.klug@ideasonboard.com>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH 2/2] apps: common: dng_writer: Fix RAW10 and RAW12\n\tpacking on BE machines","Message-ID":"<ofohgfecpjsa56bh5rjy6lq5zehrolvlb75lrlzi7bnhujjgqg@4krs6iispjse>","References":"<20240628213535.6906-1-laurent.pinchart@ideasonboard.com>\n\t<20240628213535.6906-3-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20240628213535.6906-3-laurent.pinchart@ideasonboard.com>","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>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]