{"id":22276,"url":"https://patchwork.libcamera.org/api/covers/22276/?format=json","web_url":"https://patchwork.libcamera.org/cover/22276/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20241210153440.1007470-1-mzamazal@redhat.com>","date":"2024-12-10T15:34:30","name":"[v3,0/9] Software ISP support for CCM","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"mbox":"https://patchwork.libcamera.org/cover/22276/mbox/","series":[{"id":4871,"url":"https://patchwork.libcamera.org/api/series/4871/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4871","date":"2024-12-10T15:34:30","name":"Software ISP support for CCM","version":3,"mbox":"https://patchwork.libcamera.org/series/4871/mbox/"}],"comments":"https://patchwork.libcamera.org/api/covers/22276/comments/","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 A81CBC3257\n\tfor ;\n\tTue, 10 Dec 2024 15:34:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6350F618AF;\n\tTue, 10 Dec 2024 16:34:58 +0100 (CET)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 12F29618AF\n\tfor ;\n\tTue, 10 Dec 2024 16:34:55 +0100 (CET)","from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-145-hCPFUvz2NRy_tcnXjfkNpA-1;\n\tTue, 10 Dec 2024 10:34:49 -0500","from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.17])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 693321956046; Tue, 10 Dec 2024 15:34:48 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.224.8])\n\tby mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 0B8B81956048; Tue, 10 Dec 2024 15:34:45 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"Lgiu65fx\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1733844895;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding;\n\tbh=RDZ1XfLJW/79QojK61k99zobyuODXZbXMf5BuH1uct0=;\n\tb=Lgiu65fxEHLgK4v3ONVXiYkFuOQnLZsKCSy8Qf+OrsdTqxEps1gMf9noYUet1zo4fEuo7S\n\tdLwf9feFV0Lf52hHwLySRjO6Wk/Wi4Z6/FFLFBefYlnNmnob7Wm8KIWrIZHQvOdFPHjrDl\n\trcxf4cFriySDLXR3aUIG5VTd58yCYYo=","X-MC-Unique":"hCPFUvz2NRy_tcnXjfkNpA-1","X-Mimecast-MFC-AGG-ID":"hCPFUvz2NRy_tcnXjfkNpA","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tRobert Mader ,\n\tHans de Goede ,\n\tLaurent Pinchart ,\n\tKieran Bingham ","Subject":"[PATCH v3 0/9] Software ISP support for CCM","Date":"Tue, 10 Dec 2024 16:34:30 +0100","Message-ID":"<20241210153440.1007470-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.17","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"xgUsz_uhPRvOiqy-1CcLpc8nRYLryXfCBz6HT01tcrE_1733844888","X-Mimecast-Originator":"redhat.com","Content-Type":"text/plain; charset=UTF-8","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"This series implements application of color correction matrices in\nsoftware ISP.\n\nSupport for color temperature is added to auto white balance algorithm,\nthis is needed to obtain the right CCM. A new Ccm algorithm is added to\ndetermine the matrix. Both roughly follow what the hardware pipelines\ndo.\n\nLut algorithm is modified to incorporate the CCM and perform some\nprecomputations in the form of 10 lookup tables (one per each matrix\nelement and one for gamma).\n\nA tricky part is to support both CCM and the original (no-CCM)\ntransformations. CCM obviously adds a significant overhead; per-frame\ntime increases by ~45% on Debix Model A and ~85% on TI AM69 SK. This\nmeans CCM must be optional, which is determined by presence of Ccm\nalgorithm in the tuning file.\n\nThe performance critical debayering code must not include extra\nconditionals and must work efficiently for both the cases. The macros\nin debayering code are refactored and restructured for this. An added\nbonus is that this also removes some annoying code duplication. And\nsome more, partially already present, templating is used to select\nbetween CCM and non-CCM processing.\n\nPerformance is much influenced by the data structures used in\ndebayering. I tried to define something reasonable and performed only\nbasic performance testing. Suggestions for possible improvements are\nwelcome. There is already one from Hans about avoiding using std::clamp\nin debayering but I don’t have a working patch for this yet.\n\nWhen trying to use the following imx219 color correction matrix from rpi\nsubtree, I get quite noticeable color casts:\n\n - Ccm:\n ccms:\n - ct: 2860\n ccm: [ 2.12089, -0.52461, -0.59629,\n -0.85342, 2.80445, -0.95103,\n -0.26897, -1.14788, 2.41685 ]\n - ct: 2960\n ccm: [ 2.26962, -0.54174, -0.72789,\n -0.77008, 2.60271, -0.83262,\n -0.26036, -1.51254, 2.77289 ]\n - ct: 3603\n ccm: [ 2.18644, -0.66148, -0.52496,\n -0.77828, 2.69474, -0.91645,\n -0.25239, -0.83059, 2.08298 ]\n - ct: 4650\n ccm: [ 2.18174, -0.70887, -0.47287,\n -0.70196, 2.76426, -1.06231,\n -0.25157, -0.71978, 1.97135 ]\n - ct: 5858\n ccm: [ 2.32392, -0.88421, -0.43971,\n -0.63821, 2.58348, -0.94527,\n -0.28541, -0.54112, 1.82653 ]\n - ct: 7580\n ccm: [ 2.21175, -0.53242, -0.67933,\n -0.57875, 3.07922, -1.50047,\n -0.27709, -0.73338, 2.01048 ]\n\nOne of the possible explanations could be that the software ISP AWB\n(used to determine the color temperature) is no way accurate and\nproduces some (different) color casts too. But it can also be caused by\nsome bug or misunderstanding, independent testing is welcome.\n\nChanges in v3:\n- Rebased on master.\n- AWB gains applied.\n- ccmEnabled docstring moved to the right patch.\n- Small notes about std::variant and about std::clamp added to the\n commit message of the last patch.\n\nChanges in v2:\n- Fix of the gamma table index upper boundary.\n- Fix of red<->blue being temporarily swapped in an intermediate patch.\n- Fix of CCM transformation when swapRedBlueGains_ is true.\n- A related minor lookup data structures rearrangement, with an\n unintended but welcome effect of ~10% speedup with CCM in my\n environment. \n\nMilan Zamazal (9):\n libcamera: software_isp: Determine color temperature\n libcamera: software_isp: Store color temperature to metadata\n libcamera: software_isp: lut: Remove maybe_unused on a used argument\n libcamera: software_isp: Use common code to store debayered pixels\n libcamera: software_isp: Use a macro to assign debayering methods\n libcamera: software_isp: Add CCM algorithm\n libcamera: software_isp: Add an example CCM to uncalibrated.yaml\n libcamera: software_isp: Track whether CCM is enabled\n libcamera: software_isp: Apply CCM in debayering\n\n .../internal/software_isp/debayer_params.h | 20 ++-\n include/libcamera/ipa/soft.mojom | 2 +-\n src/ipa/simple/algorithms/awb.cpp | 18 ++-\n src/ipa/simple/algorithms/ccm.cpp | 86 ++++++++++++\n src/ipa/simple/algorithms/ccm.h | 46 ++++++\n src/ipa/simple/algorithms/lut.cpp | 67 ++++++---\n src/ipa/simple/algorithms/lut.h | 1 +\n src/ipa/simple/algorithms/meson.build | 1 +\n src/ipa/simple/data/uncalibrated.yaml | 7 +\n src/ipa/simple/ipa_context.h | 24 +++-\n src/ipa/simple/soft_simple.cpp | 8 +-\n src/libcamera/software_isp/debayer.cpp | 53 ++++++-\n src/libcamera/software_isp/debayer.h | 3 +-\n src/libcamera/software_isp/debayer_cpu.cpp | 132 ++++++++++--------\n src/libcamera/software_isp/debayer_cpu.h | 31 ++--\n src/libcamera/software_isp/software_isp.cpp | 11 +-\n 16 files changed, 400 insertions(+), 110 deletions(-)\n create mode 100644 src/ipa/simple/algorithms/ccm.cpp\n create mode 100644 src/ipa/simple/algorithms/ccm.h"}