{"id":20528,"url":"https://patchwork.libcamera.org/api/1.1/patches/20528/?format=json","web_url":"https://patchwork.libcamera.org/patch/20528/","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":"<20240703141726.252368-15-stefan.klug@ideasonboard.com>","date":"2024-07-03T14:17:03","name":"[v3,14/23] libtuning: Use the color member of the Image class","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"a1a88f86095941cc214281680bc4b603808709cf","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20528/mbox/","series":[{"id":4437,"url":"https://patchwork.libcamera.org/api/1.1/series/4437/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4437","date":"2024-07-03T14:16:49","name":"Add ccm calibration to libtuning","version":3,"mbox":"https://patchwork.libcamera.org/series/4437/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20528/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20528/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 DAD9BBEFBE\n\tfor ;\n\tWed, 3 Jul 2024 14:18:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3EF0263368;\n\tWed, 3 Jul 2024 16:18:19 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C2FF363363\n\tfor ;\n\tWed, 3 Jul 2024 16:18:14 +0200 (CEST)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:9263:c199:9587:576])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 968334CA;\n\tWed, 3 Jul 2024 16:17:46 +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=\"P5U/Hlb2\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1720016266;\n\tbh=5MpIYAHJLL4DqpfdN0/TluQv04AANiSdXaGOkaHuJ4I=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=P5U/Hlb2RHlchdtw7N0/txyyOTF+MrIIF+K/dw7rBgu5b3l9q/At2VN1gmOzry3Ej\n\tefHf0cpZwR2lXfstem3twNKbhx5o6SoMGOxe0Gj5gjU/3DQZ007thbMrJBHFHberlQ\n\tzZrLfxfoHNhudeQB2PRW7scDvGrCXTxNv6LnUvLI=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ,\n\tLaurent Pinchart ","Subject":"[PATCH v3 14/23] libtuning: Use the color member of the Image class","Date":"Wed, 3 Jul 2024 16:17:03 +0200","Message-ID":"<20240703141726.252368-15-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20240703141726.252368-1-stefan.klug@ideasonboard.com>","References":"<20240703141726.252368-1-stefan.klug@ideasonboard.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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"In the Image class the variable holding the color temperature is named\ncolor instead of col which was used by the raspberry pi scripts. Rename\naccordingly.\n\nSigned-off-by: Stefan Klug \nReviewed-by: Laurent Pinchart \n---\n utils/tuning/libtuning/ctt_awb.py | 2 +-\n utils/tuning/libtuning/ctt_ccm.py | 8 ++++----\n 2 files changed, 5 insertions(+), 5 deletions(-)","diff":"diff --git a/utils/tuning/libtuning/ctt_awb.py b/utils/tuning/libtuning/ctt_awb.py\nindex f3a1ce779e21..abf22321a0ea 100644\n--- a/utils/tuning/libtuning/ctt_awb.py\n+++ b/utils/tuning/libtuning/ctt_awb.py\n@@ -313,7 +313,7 @@ def get_alsc_patches(Img, colour_cals, grey=True):\n g_patchs = (patches[1][3::4]+patches[2][3::4])/2 - Img.blacklevel_16\n else:\n cen_coords = Img.cen_coords\n- col = Img.col\n+ col = Img.color\n patches = [np.array(Img.patches[i]) for i in Img.order]\n r_patchs = patches[0] - Img.blacklevel_16\n b_patchs = patches[3] - Img.blacklevel_16\ndiff --git a/utils/tuning/libtuning/ctt_ccm.py b/utils/tuning/libtuning/ctt_ccm.py\nindex c4362756c3c0..086ef8a2580b 100644\n--- a/utils/tuning/libtuning/ctt_ccm.py\n+++ b/utils/tuning/libtuning/ctt_ccm.py\n@@ -249,7 +249,7 @@ def ccm(Cam, cal_cr_list, cal_cb_list):\n logger.info(f'delta E optimized: average: {after_average:.2f} max:{new_worst_delta_e:.2f}')\n logger.info(f'delta E old: average: {before_average:.2f} max:{old_worst_delta_e:.2f}')\n \n- visualise_macbeth_chart(m_rgb, optimised_ccm_rgb, after_gamma_rgb, str(Img.col) + str(matrix_selection_types[typenum]))\n+ visualise_macbeth_chart(m_rgb, optimised_ccm_rgb, after_gamma_rgb, str(Img.color) + str(matrix_selection_types[typenum]))\n '''\n The program will also save some visualisations of improvements.\n Very pretty to look at. Top rectangle is ideal, Left square is\n@@ -260,10 +260,10 @@ def ccm(Cam, cal_cr_list, cal_cb_list):\n if a ccm has already been calculated for that temperature then don't\n overwrite but save both. They will then be averaged later on\n \"\"\" # Now going to use optimised color matrix, optimised_ccm\n- if Img.col in ccm_tab.keys():\n- ccm_tab[Img.col].append(optimised_ccm)\n+ if Img.color in ccm_tab.keys():\n+ ccm_tab[Img.color].append(optimised_ccm)\n else:\n- ccm_tab[Img.col] = [optimised_ccm]\n+ ccm_tab[Img.color] = [optimised_ccm]\n \n logger.info('Finished processing images')\n \"\"\"\n","prefixes":["v3","14/23"]}