libcamera/libcamera.git - libcamera official repository

diff options

author	Laurent Pinchart <laurent.pinchart@ideasonboard.com>	2021-07-03 18:33:55 +0300
committer	Laurent Pinchart <laurent.pinchart@ideasonboard.com>	2021-08-31 22:44:11 +0300
commit	2b314587638f0a14b95cf579ba963c2237560537 (patch)
tree	4eaa0d19d296380ff09e3a2eac0e09e8841a1164
parent	41a8f8a9cc09bbcb933d44b7ba5aa41f2230678c (diff)

libcamera: pipeline: simple: Store all entity devices in common map

Merge the SimplePipelineHandler videos_ and subdevs_ maps, which respectively store V4L2 video devices and subdevices associated with entities, into a single entities_ map that contains an EntityData structure. This gathers all data about entities in a single place, allowing for easy extension of entity data in the future. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Tested-by: Martin Kepplinger <martin.kepplinger@puri.sm>

Diffstat

-rw-r--r--

src/libcamera/pipeline/simple/simple.cpp

1 files changed, 36 insertions, 29 deletions

#!/usr/bin/env python3 # # SPDX-License-Identifier: BSD-2-Clause # # Copyright (C) 2019, Raspberry Pi Ltd # # camera tuning tool import os import sys from ctt_image_load import * from ctt_cac import * from ctt_ccm import * from ctt_awb import * from ctt_alsc import * from ctt_lux import * from ctt_noise import * from ctt_geq import * from ctt_pretty_print_json import pretty_print import random import json import re """ This file houses the camera object, which is used to perform the calibrations. The camera object houses all the calibration images as attributes in three lists: - imgs (macbeth charts) - imgs_alsc (alsc correction images) - imgs_cac (cac correction images) Various calibrations are methods of the camera object, and the output is stored in a dictionary called self.json. Once all the caibration has been completed, the Camera.json is written into a json file. The camera object initialises its json dictionary by reading from a pre-written blank json file. This has been done to avoid reproducing the entire json file in the code here, thereby avoiding unecessary clutter. """ """ Get the colour and lux values from the strings of each inidvidual image """ def get_col_lux(string): """ Extract colour and lux values from filename """ col = re.search(r'([0-9]+)[kK](\.(jpg|jpeg|brcm|dng)|_.*\.(jpg|jpeg|brcm|dng))$', string) lux = re.search(r'([0-9]+)[lL](\.(jpg|jpeg|brcm|dng)|_.*\.(jpg|jpeg|brcm|dng))$', string) try: col = col.group(1) except AttributeError: """ Catch error if images labelled incorrectly and pass reasonable defaults """ return None, None try: lux = lux.group(1) except AttributeError: """ Catch error if images labelled incorrectly and pass reasonable defaults Still returns colour if that has been found. """ return col, None return int(col), int(lux) """ Camera object that is the backbone of the tuning tool. Input is the desired path of the output json. """ class Camera: def __init__(self, jfile, json): self.path = os.path.dirname(os.path.expanduser(__file__)) + '/' if self.path == '/': self.path = '' self.imgs = [] self.imgs_alsc = [] self.imgs_cac = [] self.log = 'Log created : ' + time.asctime(time.localtime(time.time())) self.log_separator = '\n'+'-'*70+'\n' self.jf = jfile """ initial json dict populated by uncalibrated values """ self.json = json """ Perform colour correction calibrations by comparing macbeth patch colours to standard macbeth chart colours. """ def ccm_cal(self, do_alsc_colour, grid_size): if 'rpi.ccm' in self.disable: return 1 print('\nStarting CCM calibration') self.log_new_sec('CCM') """ if image is greyscale then CCm makes no sense """ if self.grey: print('\nERROR: Can\'t do CCM on greyscale image!') self.log += '\nERROR: Cannot perform CCM calibration ' self.log += 'on greyscale image!\nCCM aborted!' del self.json['rpi.ccm'] return 0 a = time.time() """ Check if alsc tables have been generated, if not then do ccm without alsc """ if ("rpi.alsc" not in self.disable) and do_alsc_colour: """ case where ALSC colour has been done, so no errors should be expected... """ try: cal_cr_list = self.json['rpi.alsc']['calibrations_Cr'] cal_cb_list = self.json['rpi.alsc']['calibrations_Cb'] self.log += '\nALSC tables found successfully' except KeyError: cal_cr_list, cal_cb_list = None, None print('WARNING! No ALSC tables found for CCM!') print('Performing CCM calibrations without ALSC correction...') self.log += '\nWARNING: No ALSC tables found.\nCCM calibration ' self.log += 'performed without ALSC correction...' else: """ case where config options result in CCM done without ALSC colour tables """ cal_cr_list, cal_cb_list = None, None self.log += '\nWARNING: No ALSC tables found.\nCCM calibration ' self.log += 'performed without ALSC correction...' """ Do CCM calibration """ try: ccms = ccm(self, cal_cr_list, cal_cb_list, grid_size) except ArithmeticError: print('ERROR: Matrix is singular!\nTake new pictures and try again...') self.log += '\nERROR: Singular matrix encountered during fit!' self.log += '\nCCM aborted!' return 1 """ Write output to json """ self.json['rpi.ccm']['ccms'] = ccms self.log += '\nCCM calibration written to json file' print('Finished CCM calibration') """ Perform chromatic abberation correction using multiple dots images. """ def cac_cal(self, do_alsc_colour): if 'rpi.cac' in self.disable: return 1 print('\nStarting CAC calibration') self.log_new_sec('CAC') """ check if cac images have been taken """ if len(self.imgs_cac) == 0: print('\nError:\nNo cac calibration images found') self.log += '\nERROR: No CAC calibration images found!' self.log += '\nCAC calibration aborted!' return 1 """ if image is greyscale then CAC makes no sense """ if self.grey: print('\nERROR: Can\'t do CAC on greyscale image!') self.log += '\nERROR: Cannot perform CAC calibration ' self.log += 'on greyscale image!\nCAC aborted!' del self.json['rpi.cac'] return 0 a = time.time() """ Check if camera is greyscale or color. If not greyscale, then perform cac """ if do_alsc_colour: """ Here we have a color sensor. Perform cac """ try: cacs = cac(self) except ArithmeticError: print('ERROR: Matrix is singular!\nTake new pictures and try again...') self.log += '\nERROR: Singular matrix encountered during fit!' self.log += '\nCAC aborted!' return 1 else: """ case where config options suggest greyscale camera. No point in doing CAC """ cal_cr_list, cal_cb_list = None, None self.log += '\nWARNING: No ALSC tables found.\nCAC calibration ' self.log += 'performed without ALSC correction...' """ Write output to json """ self.json['rpi.cac']['cac'] = cacs self.log += '\nCAC calibration written to json file' print('Finished CAC calibration') """ Auto white balance calibration produces a colour curve for various colour temperatures, as well as providing a maximum 'wiggle room' distance from this curve (transverse_neg/pos). """ def awb_cal(self, greyworld, do_alsc_colour, grid_size): if 'rpi.awb' in self.disable: return 1 print('\nStarting AWB calibration') self.log_new_sec('AWB') """ if image is greyscale then AWB makes no sense """ if self.grey: print('\nERROR: Can\'t do AWB on greyscale image!') self.log += '\nERROR: Cannot perform AWB calibration ' self.log += 'on greyscale image!\nAWB aborted!' del self.json['rpi.awb'] return 0 """ optional set greyworld (e.g. for noir cameras) """ if greyworld: self.json['rpi.awb']['bayes'] = 0 self.log += '\nGreyworld set' """ Check if alsc tables have been generated, if not then do awb without alsc correction """ if ("rpi.alsc" not in self.disable) and do_alsc_colour: try: cal_cr_list = self.json['rpi.alsc']['calibrations_Cr'] cal_cb_list = self.json['rpi.alsc']['calibrations_Cb'] self.log += '\nALSC tables found successfully' except KeyError: cal_cr_list, cal_cb_list = None, None print('ERROR, no ALSC calibrations found for AWB') print('Performing AWB without ALSC tables') self.log += '\nWARNING: No ALSC tables found.\nAWB calibration ' self.log += 'performed without ALSC correction...' else: cal_cr_list, cal_cb_list = None, None self.log += '\nWARNING: No ALSC tables found.\nAWB calibration ' self.log += 'performed without ALSC correction...' """ call calibration function """ plot = "rpi.awb" in self.plot awb_out = awb(self, cal_cr_list, cal_cb_list, plot, grid_size) ct_curve, transverse_neg, transverse_pos = awb_out """ write output to json """ self.json['rpi.awb']['ct_curve'] = ct_curve self.json['rpi.awb']['sensitivity_r'] = 1.0 self.json['rpi.awb']['sensitivity_b'] = 1.0 self.json['rpi.awb']['transverse_pos'] = transverse_pos self.json['rpi.awb']['transverse_neg'] = transverse_neg self.log += '\nAWB calibration written to json file' print('Finished AWB calibration') """ Auto lens shading correction completely mitigates the effects of lens shading for ech colour channel seperately, and then partially corrects for vignetting. The extent of the correction depends on the 'luminance_strength' parameter. """ def alsc_cal(self, luminance_strength, do_alsc_colour, grid_size, max_gain=8.0): if 'rpi.alsc' in self.disable: return 1 print('\nStarting ALSC calibration') self.log_new_sec('ALSC') """ check if alsc images have been taken """ if len(self.imgs_alsc) == 0: print('\nError:\nNo alsc calibration images found') self.log += '\nERROR: No ALSC calibration images found!' self.log += '\nALSC calibration aborted!' return 1 self.json['rpi.alsc']['luminance_strength'] = luminance_strength if self.grey and do_alsc_colour: print('Greyscale camera so only luminance_lut calculated') do_alsc_colour = False self.log += '\nWARNING: ALSC colour correction cannot be done on ' self.log += 'greyscale image!\nALSC colour corrections forced off!' """ call calibration function """ plot = "rpi.alsc" in self.plot alsc_out = alsc_all(self, do_alsc_colour, plot, grid_size, max_gain=max_gain) cal_cr_list, cal_cb_list, luminance_lut, av_corn = alsc_out """ write output to json and finish if not do_alsc_colour """ if not do_alsc_colour: self.json['rpi.alsc']['luminance_lut'] = luminance_lut self.json['rpi.alsc']['n_iter'] = 0 self.log += '\nALSC calibrations written to json file' self.log += '\nNo colour calibrations performed' print('Finished ALSC calibrations') return 1


context:
space:
mode: