From patchwork Tue Jul 5 09:55:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rauch X-Patchwork-Id: 16544 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 C784ABD1F1 for ; Tue, 5 Jul 2022 09:55:57 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3D2CE63311; Tue, 5 Jul 2022 11:55:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1657014956; bh=An9X0i6Ef9+rRDe3oEn6t2yOn94uiNIubfSZdYN6cTw=; 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=3zV8UGdQ4aKCUxFKethwLMLEdPeXA8ipU102dcMuNFRTICuG03dOxHDuiKM/5DN/+ urSp8+3aEwgfkbcd/oI0LSj4p17sA7uk3bCvjGMlQIHlt9rTPbKoZ/xSYYdm7RN5ak tKDpBe6aC0T8QYST4TmUCDktGJNCdE09Tlr0byGxeKvqtBt2S5wGPnviV3uXwnySjq DS5M1I4yA+NXBtkwZaqGR6DE3YUrxvzdeqUQM+hRlpLf37NJdlKB3elpNNaibbdmrQ r2RYKjAqI0r8y3i52eY/E0smVWnAk/xipKgBGB6Cv0570pNBMb4itvrWi8kk2HCaSp +4j31WU/bKqvA== Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EBCD66330E for ; Tue, 5 Jul 2022 11:55:53 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=gmx.net header.i=@gmx.net header.b="d/txw2Jz"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1657014953; bh=An9X0i6Ef9+rRDe3oEn6t2yOn94uiNIubfSZdYN6cTw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=d/txw2Jz9X5xJeQpSK/wNtqMrqH5YYyI1CXXW7p3EbyzEy20V+rl8JtzJAvMp6UgO PPTMokBIptbmKEj68j2uz4nPVzYe0jUY7HiYrLDZ6sMBTxpj6UC4DJCkHOdyfIidEv mwaIGg9ol+ExRMUcxTPv6lAB7LBsoNk7eSVCJECY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([92.18.80.244]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MZCfJ-1o4f5U1jFZ-00V6RV; Tue, 05 Jul 2022 11:55:53 +0200 To: libcamera-devel@lists.libcamera.org Date: Tue, 5 Jul 2022 10:55:49 +0100 Message-Id: <20220705095549.87466-3-Rauch.Christian@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220705095549.87466-1-Rauch.Christian@gmx.de> References: <20220705095549.87466-1-Rauch.Christian@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:OP7huhtyEozc/c8BuhVCpa+GlF04X43VU4VFbMNmEWoF3va3mcV W5gq5NCcQKj4GpFzsHUrsSYcIM7O/UVQiT/+W38uX8ZqL1O8LQwNXVtyK5cPDYtK0UgXqO8 Kb+XrAIA0aCzvXw0iy5UFJhZoCoC8VtEyYe0X9UBUVRzX7og1bp+dk6OSx1OrzMymQjDQbz BVYqWM1/KLIN1rCqRxBwg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:G2okjdK9dcc=:HPznW9YatiPXZYWmK942aO 07vKilGjxysksVlGVbPNPgfjdsKYrz5+46R0zOAvN68a+/mzJkzweuKkGHJZ9PajYltP7WKGs 474IALRQUEEgKkH4VCYsXza4mYBsPck8CQRI/GHNAQY+S3Li1XMJ4B/a6yW3PgA3FEJWVt5a5 sK6xKGEEePb1KsT+vseNXLAd9D6mw0LejJugcOBGKWUPgpLaDoHXqRxPPawhTwMzvBHmPgUL/ 99P3762mP4frIVLpZPmUWbwPZW9+lDYzffJwwlI7tSPNLvXw/tMKgmNdaWsBWY3X7GulZgrRK H70QODjZFGzo3OEA+OIz8BuKB4LT7OMPv6rh/cjVJZ2YRDxNsl8DAK2dWJ/B3RmAqMAfIfx4Y l2qaaXp9Gj+6iYpOZg7g+8nNZ3djDkVoXbd4rl1wlX6xvMhgY94vmuFnFPefBX3Auyfi/++pb Dcoae8buS3/GmLtR/jupacfVxhSBeDaPuDYcvHyMyxls4ZxgC+fd4Y5i2AWJLkutD167+YIQf Ddm6yRx7Z0Um+Adc8mHYxG14n3XQNkqtVx5qY0QFGmwAraHbBDlF5ZyqZcaVZWCrJx+dA3BZR yY53uTH5gl6tdRBPe70Tgqq6hYTizqoRBI/9FbcnoT3HoJCEKHlN8rht5X8kFmM9fDnZkHLBE 2m1qyNYhxoK8JL7Frp9l0r8MN7XRECb7jqR66LiABad1bjm6QcbSh1P7waxjHspeJHNgefeP+ vL70vz5wNABGjPX8lnrgvJpvoeOuODXybqVqg6ddS3ZNOlm37ySlx+e9vB7x+u0mP34DBAdaO qOgtkGmm78mk8qwSirGXrxJqHz/7ipDqPWJh+yCQ8KT3aA6vYU58Fp3v5TLH7wIfNbOmm6Yy9 DY4UJr7cWWbHQM5Egy7Fkp/hgtUg9LdEv5XzOcMt4W3hBgC56WX5Ma8QKJabEPg3ylyXZzHvk NWlhk0BOwQDKfg5LW8rC4zr13o4ZCJSDkCjNIPTr9h1/9CGPJsK9Tk9FN4VXS6qEjXla3ZEnW a6sHaazW27xvjNKN5JxxuF7MctGvOLj/j9pMNl42KknMdDwPQsOh4aAFj63WGzu6hl3UvLXvb d7KMX1B8NpwG3Lm/E3VX7HNOtAOkGXNoVh6EXNO5Q7rXeYoW3PwYSYdeg== Subject: [libcamera-devel] [PATCH v10 2/2] libcamera: controls: Generate and use fixed-sized Span types 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: Christian Rauch via libcamera-devel From: Christian Rauch Reply-To: Christian Rauch Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Define Span types explicitly as either variable- or fixed-sized. This introduces a new convention for defining Span dimensions in the property and control value definitions and generates Span types as variable-sized Span or as fixed-sized Span. Signed-off-by: Christian Rauch Reviewed-by: Jacopo Mondi --- include/libcamera/controls.h | 2 +- src/ipa/raspberrypi/raspberrypi.cpp | 19 +++++------ src/libcamera/control_ids.yaml | 4 +-- .../pipeline/raspberrypi/raspberrypi.cpp | 2 +- src/libcamera/property_ids.yaml | 4 +-- src/qcam/dng_writer.cpp | 2 +- utils/gen-controls.py | 32 +++++++++++++------ 7 files changed, 39 insertions(+), 26 deletions(-) -- 2.34.1 diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 192be784..a19f1845 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -168,7 +168,7 @@ public: using V = typename T::value_type; const V *value = reinterpret_cast(data().data()); - return { value, numElements_ }; + return T{ value, numElements_ }; } #ifndef __DOXYGEN__ diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index c7492a77..baaa1e08 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -559,18 +559,19 @@ void IPARPi::reportMetadata() AwbStatus *awbStatus = rpiMetadata_.GetLocked("awb.status"); if (awbStatus) { - libcameraMetadata_.set(controls::ColourGains, { static_cast(awbStatus->gain_r), - static_cast(awbStatus->gain_b) }); + libcameraMetadata_.set(controls::ColourGains, + Span({ static_cast(awbStatus->gain_r), + static_cast(awbStatus->gain_b) })); libcameraMetadata_.set(controls::ColourTemperature, awbStatus->temperature_K); } BlackLevelStatus *blackLevelStatus = rpiMetadata_.GetLocked("black_level.status"); if (blackLevelStatus) libcameraMetadata_.set(controls::SensorBlackLevels, - { static_cast(blackLevelStatus->black_level_r), - static_cast(blackLevelStatus->black_level_g), - static_cast(blackLevelStatus->black_level_g), - static_cast(blackLevelStatus->black_level_b) }); + Span({ blackLevelStatus->black_level_r, + blackLevelStatus->black_level_g, + blackLevelStatus->black_level_g, + blackLevelStatus->black_level_b })); FocusStatus *focusStatus = rpiMetadata_.GetLocked("focus.status"); if (focusStatus && focusStatus->num == 12) { @@ -875,7 +876,7 @@ void IPARPi::queueRequest(const ControlList &controls) if (gains[0] != 0.0f && gains[1] != 0.0f) /* A gain of 0.0f will switch back to auto mode. */ libcameraMetadata_.set(controls::ColourGains, - { gains[0], gains[1] }); + Span({ gains[0], gains[1] })); break; } @@ -1159,8 +1160,8 @@ void IPARPi::applyFrameDurations(Duration minFrameDuration, Duration maxFrameDur /* Return the validated limits via metadata. */ libcameraMetadata_.set(controls::FrameDurationLimits, - { static_cast(minFrameDuration_.get()), - static_cast(maxFrameDuration_.get()) }); + Span({ static_cast(minFrameDuration_.get()), + static_cast(maxFrameDuration_.get()) })); /* * Calculate the maximum exposure time possible for the AGC to use. diff --git a/src/libcamera/control_ids.yaml b/src/libcamera/control_ids.yaml index ecab3ae9..5fa168c6 100644 --- a/src/libcamera/control_ids.yaml +++ b/src/libcamera/control_ids.yaml @@ -291,7 +291,7 @@ controls: transformation. The 3x3 matrix is stored in conventional reading order in an array of 9 floating point values. - size: [3x3] + size: [3,3] - ScalerCrop: type: Rectangle @@ -525,7 +525,7 @@ controls: the window where the focal distance for the objects shown in that part of the image are closest to the camera. - size: [n] + size: [] - AfTrigger: type: int32_t diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 28f054cb..d88aa256 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -1717,7 +1717,7 @@ void RPiCameraData::statsMetadataComplete(uint32_t bufferId, const ControlList & * V4L2_CID_NOTIFY_GAINS control (which means notifyGainsUnity_ is set). */ if (notifyGainsUnity_ && controls.contains(libcamera::controls::ColourGains)) { - libcamera::Span colourGains = + libcamera::Span colourGains = *controls.get(libcamera::controls::ColourGains); /* The control wants linear gains in the order B, Gb, Gr, R. */ ControlList ctrls(sensor_->controls()); diff --git a/src/libcamera/property_ids.yaml b/src/libcamera/property_ids.yaml index 11b7ebdc..a87485d7 100644 --- a/src/libcamera/property_ids.yaml +++ b/src/libcamera/property_ids.yaml @@ -497,7 +497,7 @@ controls: - PixelArrayOpticalBlackRectangles: type: Rectangle - size: [n] + size: [] description: | The pixel array region(s) which contain optical black pixels considered valid for calibration purposes. @@ -592,7 +592,7 @@ controls: - PixelArrayActiveAreas: type: Rectangle - size: [n] + size: [] description: | The PixelArrayActiveAreas property defines the (possibly multiple and overlapping) portions of the camera sensor readable pixel matrix diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp index 4b5d8276..23612be0 100644 --- a/src/qcam/dng_writer.cpp +++ b/src/qcam/dng_writer.cpp @@ -514,7 +514,7 @@ int DNGWriter::write(const char *filename, const Camera *camera, uint32_t whiteLevel = (1 << info->bitsPerSample) - 1; if (metadata.contains(controls::SensorBlackLevels)) { - Span levels = + Span levels = *metadata.get(controls::SensorBlackLevels); /* diff --git a/utils/gen-controls.py b/utils/gen-controls.py index 3f99b5e2..46ba4394 100755 --- a/utils/gen-controls.py +++ b/utils/gen-controls.py @@ -7,6 +7,8 @@ # gen-controls.py - Generate control definitions from YAML import argparse +from functools import reduce +import operator import string import sys import yaml @@ -22,6 +24,24 @@ def format_description(description): return '\n'.join([(line and ' * ' or ' *') + line for line in description]) +def get_ctrl_type(ctrl): + ctrl_type = ctrl['type'] + ctrl_size_arr = ctrl.get('size') + + if ctrl_type == 'string': + return 'std::string' + elif ctrl_size_arr is not None: + if len(ctrl_size_arr) > 0: + # fixed-sized Span + ctrl_span_size = reduce(operator.mul, ctrl_size_arr) + return f"Span" + else: + # variable-sized Span + return f"Span" + else: + return ctrl_type + + def generate_cpp(controls): enum_doc_start_template = string.Template('''/** * \\enum ${name}Enum @@ -50,11 +70,7 @@ ${description} name, ctrl = ctrl.popitem() id_name = snake_case(name).upper() - ctrl_type = ctrl['type'] - if ctrl_type == 'string': - ctrl_type = 'std::string' - elif ctrl.get('size'): - ctrl_type = 'Span' % ctrl_type + ctrl_type = get_ctrl_type(ctrl) info = { 'name': name, @@ -135,11 +151,7 @@ def generate_h(controls): ids.append('\t' + id_name + ' = ' + str(id_value) + ',') - ctrl_type = ctrl['type'] - if ctrl_type == 'string': - ctrl_type = 'std::string' - elif ctrl.get('size'): - ctrl_type = 'Span' % ctrl_type + ctrl_type = get_ctrl_type(ctrl) info = { 'name': name,