From patchwork Sat Oct 22 06:23:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 17655 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 E35F1C0DA4 for ; Sat, 22 Oct 2022 06:23:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9145D62ED6; Sat, 22 Oct 2022 08:23:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1666419811; bh=fm9gcyQT6tddQvpWlWmvET8AL/c3VhA4sd8JH59SfWg=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=2FEIKbgKu1opG0Xdt+sO+OlaXT7R+iyyQL2yzlB7EGSud+0EFCAfreZ6eRaXuqtXL nvPLvCXxSPopktdpILPmpch43fYEhKuSM/GOBC0K15+WCwQxmJvYeOf3jap5lMXceH yShmeN1j7IJfHF0FbKxkSjaunJZqbWmxV5F/TmPRzuond+ScVt/rqRE7AN0c/0xdjg 4KbkYzwK/vr2fzKVAovLhDNWiOhCNFSflXnEOx5jcuYpr0NPevWQRSkQzKezKXC3YG tjMZayrT86GlQC+aRMIS3hLjpyh0EgXGrXtj7dAfDQZvgXGsNlUxmePvNKnPf23Rpm vv7SgPolnwb8g== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2990B62EC8 for ; Sat, 22 Oct 2022 08:23:28 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="cfgjEjSu"; dkim-atps=neutral Received: from pyrite.rasen.tech (h175-177-042-159.catv02.itscom.jp [175.177.42.159]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B8EC9891; Sat, 22 Oct 2022 08:23:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1666419807; bh=fm9gcyQT6tddQvpWlWmvET8AL/c3VhA4sd8JH59SfWg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cfgjEjSuowzytPnHPecZZZrFahaFTARI41ne2/G6BvRP3gFgsmcxBcsjHnhaxxKjr yBB7GqKNlRWDpwqp9U2afI25QDYApIGA1MSAGWif0CSWOC1OI1r3qmIBHmgRM78e8F C+c0x7mYqgA12P+TXXaKp5djlTf4ZhpkFdVlcmj8= To: libcamera-devel@lists.libcamera.org Date: Sat, 22 Oct 2022 15:23:03 +0900 Message-Id: <20221022062310.2545463-5-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221022062310.2545463-1-paul.elder@ideasonboard.com> References: <20221022062310.2545463-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 04/11] utils: libtuning: modules: alsc: Add rkisp1 ALSC module 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: , X-Patchwork-Original-From: Paul Elder via libcamera-devel From: Paul Elder Reply-To: Paul Elder Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add an ALSC module for RkISP1. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- New in v2 --- .../tuning/libtuning/modules/alsc/__init__.py | 1 + utils/tuning/libtuning/modules/alsc/rkisp1.py | 112 ++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 utils/tuning/libtuning/modules/alsc/rkisp1.py diff --git a/utils/tuning/libtuning/modules/alsc/__init__.py b/utils/tuning/libtuning/modules/alsc/__init__.py index ef6300c2..932ce38e 100644 --- a/utils/tuning/libtuning/modules/alsc/__init__.py +++ b/utils/tuning/libtuning/modules/alsc/__init__.py @@ -4,3 +4,4 @@ from libtuning.modules.alsc.alsc import ALSC from libtuning.modules.alsc.raspberrypi import ALSCRaspberryPi +from libtuning.modules.alsc.rkisp1 import ALSCRkISP1 diff --git a/utils/tuning/libtuning/modules/alsc/rkisp1.py b/utils/tuning/libtuning/modules/alsc/rkisp1.py new file mode 100644 index 00000000..d8f253e6 --- /dev/null +++ b/utils/tuning/libtuning/modules/alsc/rkisp1.py @@ -0,0 +1,112 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (C) 2019, Raspberry Pi Ltd +# Copyright (C) 2022, Paul Elder + +from .alsc import ALSC + +import libtuning as lt +import libtuning.utils as utils + +from numbers import Number +import numpy as np + + +class ALSCRkISP1(ALSC): + hr_name = 'ALSC (RkISP1)' + out_name = 'LensShadingCorrection' + # todo Not sure if this is useful. Probably will remove later. + compatible = ['rkisp1'] + + def __init__(self, *args, **kwargs): + super().__init__(**kwargs) + + # We don't actually need anything from the config file + def _validate_config(self, config: dict) -> bool: + return True + + # @return Image color temperature, flattened array of red calibration table + # (containing {sector size} elements), flattened array of blue + # calibration table, flattened array of (red's) green calibration + # table, flattened array of (blue's) green calibration table + + def _do_single_alsc(self, image: lt.Image): + cgr, gr = self._lsc_single_channel(image.channels[lt.Color.GR], image) + cgb, gb = self._lsc_single_channel(image.channels[lt.Color.GB], image) + + # Should these ratio against the average of both greens or just each + # green like we've done here? + cr, _ = self._lsc_single_channel(image.channels[lt.Color.R], image, gr) + cb, _ = self._lsc_single_channel(image.channels[lt.Color.B], image, gb) + + return image.color, cr.flatten(), cb.flatten(), cgr.flatten(), cgb.flatten() + + # @return List of dictionaries of color temperature, red table, red's green + # table, blue's green table, and blue table + + def _do_all_alsc(self, images: list) -> list: + output_list = [] + output_map_func = lt.gradient.Linear().map + output_map_domain = (1, 3.999) + output_map_range = (1024, 4095) + + # List of colour temperatures + list_col = [] + # Associated calibration tables + list_cr = [] + list_cb = [] + list_cgr = [] + list_cgb = [] + for image in self._enumerate_alsc_images(images): + col, cr, cb, cgr, cgb = self._do_single_alsc(image) + list_col.append(col) + list_cr.append(cr) + list_cb.append(cb) + list_cgr.append(cgr) + list_cgb.append(cgb) + + # Convert to numpy array for data manipulation + list_col = np.array(list_col) + list_cr = np.array(list_cr) + list_cb = np.array(list_cb) + list_cgr = np.array(list_cgr) + list_cgb = np.array(list_cgb) + + for color_temperature in sorted(set(list_col)): + # Average tables for the same colour temperature + indices = np.where(list_col == color_temperature) + color_temperature = int(color_temperature) + + tables = [] + for lis in [list_cr, list_cgr, list_cgb, list_cb]: + table = np.mean(lis[indices], axis=0) + table = output_map_func(output_map_domain, output_map_range, table) + table = np.round(table).astype('int32').tolist() + tables.append(table) + + entry = { + 'ct': color_temperature, + 'r': tables[0], + 'gr': tables[1], + 'gb': tables[2], + 'b': tables[3], + } + + output_list.append(entry) + + return output_list + + def _process(self, args, config: dict, images: list, outputs: dict) -> dict: + output = {} + + # todo This should actually come from self.sector_{x,y}_gradient + size_gradient = lt.gradient.Linear(lt.Remainder.Float) + output['x-size'] = size_gradient.distribute(0.5, 8) + output['y-size'] = size_gradient.distribute(0.5, 8) + + output['sets'] = self._do_all_alsc(images) + + # todo Validate images from greyscale camera and force grescale mode + # todo Debug functionality + + return output