{"id":19631,"url":"https://patchwork.libcamera.org/api/1.1/patches/19631/?format=json","web_url":"https://patchwork.libcamera.org/patch/19631/","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":"<20240305110136.3624-3-nick.hollinghurst@raspberrypi.com>","date":"2024-03-05T11:01:36","name":"[2/2] ipa: rpi: cam_helper: Extend embedded data parsing to RAW14 modes","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"213a4d8eb1800588cc4a43c3fedc680d5313ee02","submitter":{"id":130,"url":"https://patchwork.libcamera.org/api/1.1/people/130/?format=json","name":"Nick Hollinghurst","email":"nick.hollinghurst@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19631/mbox/","series":[{"id":4202,"url":"https://patchwork.libcamera.org/api/1.1/series/4202/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4202","date":"2024-03-05T11:01:34","name":"Add 14-bit Bayer format support","version":1,"mbox":"https://patchwork.libcamera.org/series/4202/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19631/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19631/checks/","tags":{},"headers":{"Return-Path":"","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 66271C326C\n\tfor ;\n\tTue, 5 Mar 2024 11:01:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 465FC62875;\n\tTue, 5 Mar 2024 12:01:51 +0100 (CET)","from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com\n\t[IPv6:2a00:1450:4864:20::52a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BAB3262868\n\tfor ;\n\tTue, 5 Mar 2024 12:01:47 +0100 (CET)","by mail-ed1-x52a.google.com with SMTP id\n\t4fb4d7f45d1cf-566e869f631so4508442a12.0\n\tfor ;\n\tTue, 05 Mar 2024 03:01:47 -0800 (PST)","from raspberrypi.pitowers.org\n\t([2001:4d4e:300:1f:47b7:9ea3:c642:9870])\n\tby smtp.gmail.com with ESMTPSA id\n\tfk25-20020a056402399900b00566a461e1ecsm5613726edb.73.2024.03.05.03.01.47\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 05 Mar 2024 03:01:47 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"BbGZktws\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1709636507; x=1710241307;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=PcSzdAggpLbnR/OqlyoIDDkxS4yw4uMH9BiGn/ZzXEw=;\n\tb=BbGZktwsinMR9OoHTOJqn5OPN+mIUr46ILoyblQxilCMpJnfW35pNNae8EHJDqqVRR\n\t+in7k8F0uFR10iyVXB2brvqI7hN/wltRG2IRNd60rGJzKq/RSSDGqf5XSluXGco62V45\n\tNbNYbPICylTF03/6/l3C8z51tL30jY/rCgqFsga3TXCEUnXubYSHSkHGKRu9i2AFw/WX\n\tNNNOQf+k3YCqtZFPAYd+DSHqNSCjlaB3jRv142YvFKBXAdqws9TLXJBXRe39rRmSOFHV\n\twlOaYvhxIzOICc2KJgWFvg9nzs4ozsLVwXwyu/W7J0zqA9HVP640BYMcG3qCI7ZGPXKc\n\tr8CQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1709636507; x=1710241307;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=PcSzdAggpLbnR/OqlyoIDDkxS4yw4uMH9BiGn/ZzXEw=;\n\tb=kOGtHEF6sb9yNlOdNiExI8apEKRLZH2RMRRbMgk88tTlFHbknbM8bJDMzerHgEmnak\n\trngTaWjLun9LMXyq/7biTA7/sWUsfcIxTHlAER862aQbXkvzprvFDcJ8/A876ZXiD7wW\n\twckEEHCfzm5WpVXefKSiTXFajy3AMP+oJpOmMJAvkakgInU3HfDLrcr1vvy3KwCB1YFf\n\tf3QNgcwz5KJn6pJBURizhZ0hSA2nL0W+PuJ3XkdAFQ1izht7JDTCZ6yahyiW7VBRCO30\n\tQguc9j8XEJsQz1bjGrJUKYrnach+MuflJV5DbqTw4IEiUFemoGeKJgHszOWLHpzSzL4T\n\tvpbg==","X-Gm-Message-State":"AOJu0YzQEsSyhC7gQoHsK0Og/sJXgPo7S4oM4tttfV7FVs2fdpOIHPU7\n\tWpJx8vawESW+jvpPiCvpw4uATX7jeuZc7b3nRUEttHCv6BOpodv7VCoOWkJLUVLV8W+d0UN4IGs\n\t1","X-Google-Smtp-Source":"AGHT+IHMylVSu/xRYsnIrmnarsCok5FeKlI1JHqTxx1k4M+aSY9Bf1XexdK4CW//Qvu8XivYe2iLxw==","X-Received":"by 2002:a05:6402:5c3:b0:566:66cc:633c with SMTP id\n\tn3-20020a05640205c300b0056666cc633cmr8092954edx.7.1709636507332; \n\tTue, 05 Mar 2024 03:01:47 -0800 (PST)","From":"Nick Hollinghurst ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH 2/2] ipa: rpi: cam_helper: Extend embedded data parsing to\n\tRAW14 modes","Date":"Tue, 5 Mar 2024 11:01:36 +0000","Message-Id":"<20240305110136.3624-3-nick.hollinghurst@raspberrypi.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20240305110136.3624-1-nick.hollinghurst@raspberrypi.com>","References":"<20240305110136.3624-1-nick.hollinghurst@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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","Cc":"Nick Hollinghurst ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Fix embedded data byte-skipping for 14-bit modes (4 out of 7 bytes\ncarry register data), and allow 14-bit modes in IMX708 PDAF parsing.\n\nSigned-off-by: Nick Hollinghurst \n---\n src/ipa/rpi/cam_helper/cam_helper_imx708.cpp | 2 +-\n src/ipa/rpi/cam_helper/md_parser_smia.cpp | 11 +++++++----\n 2 files changed, 8 insertions(+), 5 deletions(-)","diff":"diff --git a/src/ipa/rpi/cam_helper/cam_helper_imx708.cpp b/src/ipa/rpi/cam_helper/cam_helper_imx708.cpp\nindex dce39cd5..906c6fa2 100644\n--- a/src/ipa/rpi/cam_helper/cam_helper_imx708.cpp\n+++ b/src/ipa/rpi/cam_helper/cam_helper_imx708.cpp\n@@ -269,7 +269,7 @@ bool CamHelperImx708::parsePdafData(const uint8_t *ptr, size_t len,\n {\n \tsize_t step = bpp >> 1; /* bytes per PDAF grid entry */\n \n-\tif (bpp < 10 || bpp > 12 || len < 194 * step || ptr[0] != 0 || ptr[1] >= 0x40) {\n+\tif (bpp < 10 || bpp > 14 || len < 194 * step || ptr[0] != 0 || ptr[1] >= 0x40) {\n \t\tLOG(IPARPI, Error) << \"PDAF data in unsupported format\";\n \t\treturn false;\n \t}\ndiff --git a/src/ipa/rpi/cam_helper/md_parser_smia.cpp b/src/ipa/rpi/cam_helper/md_parser_smia.cpp\nindex 210787ed..c5b806d7 100644\n--- a/src/ipa/rpi/cam_helper/md_parser_smia.cpp\n+++ b/src/ipa/rpi/cam_helper/md_parser_smia.cpp\n@@ -86,10 +86,13 @@ MdParserSmia::ParseStatus MdParserSmia::findRegs(libcamera::Span\n \twhile (1) {\n \t\tint tag = buffer[currentOffset++];\n \n-\t\tif ((bitsPerPixel_ == 10 &&\n-\t\t (currentOffset + 1 - currentLineStart) % 5 == 0) ||\n-\t\t (bitsPerPixel_ == 12 &&\n-\t\t (currentOffset + 1 - currentLineStart) % 3 == 0)) {\n+\t\t/* Non-dummy bytes come in even-sized blocks: skip can only ever follow tag */\n+\t\twhile ((bitsPerPixel_ == 10 &&\n+\t\t\t(currentOffset + 1 - currentLineStart) % 5 == 0) ||\n+\t\t (bitsPerPixel_ == 12 &&\n+\t\t\t(currentOffset + 1 - currentLineStart) % 3 == 0) ||\n+\t\t (bitsPerPixel_ == 14 &&\n+\t\t\t(currentOffset - currentLineStart) % 7 >= 4)) {\n \t\t\tif (buffer[currentOffset++] != RegSkip)\n \t\t\t\treturn BadDummy;\n \t\t}\n","prefixes":["2/2"]}