Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 16538,
    "url": "https://patchwork.libcamera.org/api/patches/16538/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/16538/",
    "project": {
        "id": 1,
        "url": "https://patchwork.libcamera.org/api/projects/1/?format=api",
        "name": "libcamera",
        "link_name": "libcamera",
        "list_id": "libcamera_core",
        "list_email": "libcamera-devel@lists.libcamera.org",
        "web_url": "",
        "scm_url": "",
        "webscm_url": ""
    },
    "msgid": "<20220704233217.54769-2-Rauch.Christian@gmx.de>",
    "date": "2022-07-04T23:32:14",
    "name": "[libcamera-devel,v9,1/4] libcamera: controls: Use std::optional to handle invalid control values",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": false,
    "hash": "0f44000281fb7a5e58204db127d479472b6cf73d",
    "submitter": {
        "id": 111,
        "url": "https://patchwork.libcamera.org/api/people/111/?format=api",
        "name": "Christian Rauch",
        "email": "Rauch.Christian@gmx.de"
    },
    "delegate": null,
    "mbox": "https://patchwork.libcamera.org/patch/16538/mbox/",
    "series": [
        {
            "id": 3250,
            "url": "https://patchwork.libcamera.org/api/series/3250/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3250",
            "date": "2022-07-04T23:32:13",
            "name": "generate and use fixed-sized Span Control types",
            "version": 9,
            "mbox": "https://patchwork.libcamera.org/series/3250/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/16538/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/16538/checks/",
    "tags": {},
    "headers": {
        "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>",
        "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 C568BBE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  4 Jul 2022 23:32:38 +0000 (UTC)",
            "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6067863316;\n\tTue,  5 Jul 2022 01:32:36 +0200 (CEST)",
            "from mout.gmx.net (mout.gmx.net [212.227.15.19])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D45F06330C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue,  5 Jul 2022 01:32:33 +0200 (CEST)",
            "from localhost.localdomain ([92.18.80.244]) by mail.gmx.net\n\t(mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id\n\t1M5fIW-1oEXAB12s6-0079eW; Tue, 05 Jul 2022 01:32:33 +0200"
        ],
        "DKIM-Signature": [
            "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656977556;\n\tbh=lomK59UIRO1RSrhj65aOgU6BLhhyBHgMUnHMJP4IstE=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=t6+73Z+83bLJB6GkSaE5+M0SMjB00n0ast6N9565NA45m/YN9TI7KU3eztuNDnL8t\n\tAOv0uGuZST5LYbPZdpyb67kZcOmFkv4ORp8nosvMlTxnXMQoScYk9SjBsiwUPT0NB8\n\tZ7ypIhz1Zg4L8tvr40fuP4JPGZsDaBMyV7uHHIC9VWjyON/K6sySH/v2XEfe8ZLhMA\n\todHLX8bYq/K+Jk9Ga3oi3S5ng+qdkGu2dyd5ekcba8lXdSh5trqdDiz+4DN9lYlQXb\n\tn8cRgmd65uT0KgohFHQz+LsgJJ84SPhy9s9bU/z2Ki35axAhWO03L3/+wyfjbfWjuL\n\twMKbbLZndevgQ==",
            "v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;\n\ts=badeba3b8450; t=1656977553;\n\tbh=lomK59UIRO1RSrhj65aOgU6BLhhyBHgMUnHMJP4IstE=;\n\th=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;\n\tb=jJawJd0khKGZwxNweUE5l9nt5ElGqfDqiYVjIdAyiwyVxcxiwHTFZuEPQUgl+5xA2\n\txIlAt5GXrRnnuQ+tp3kOTtub9qmZEA5vZrLbMCAWh/LB8UX5pTSUy1FcU9IbrVErsq\n\t5M8IIGs77GjdAljLqwOxuWhEjq80bCFLkd9CxsjU="
        ],
        "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=gmx.net header.i=@gmx.net\n\theader.b=\"jJawJd0k\"; dkim-atps=neutral",
        "X-UI-Sender-Class": "01bb95c1-4bf8-414a-932a-4f6e2808ef9c",
        "To": "libcamera-devel@lists.libcamera.org",
        "Date": "Tue,  5 Jul 2022 00:32:14 +0100",
        "Message-Id": "<20220704233217.54769-2-Rauch.Christian@gmx.de>",
        "X-Mailer": "git-send-email 2.34.1",
        "In-Reply-To": "<20220704233217.54769-1-Rauch.Christian@gmx.de>",
        "References": "<20220704233217.54769-1-Rauch.Christian@gmx.de>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "quoted-printable",
        "X-Provags-ID": "V03:K1:vitDZqXKu2ihk0iPRAL/UxAhkgXEjiJVIbbnEsWGNdESSxflOSL\n\txqWH4X555Vw/3czXUA7eWKMdmpVcn5vTGzx0p6lo7+EOUcQOqKaxsVQFZ8zh3bGouS8Hp9q\n\tNp25hoR+T6kl1rss2CPGDnMowf4p7gdz/SjNwL15EjMcl/HosHqKVYKFLomoMqIFuoABWQw\n\toh4Y/96Oind2qjfDdlK8Q==",
        "X-Spam-Flag": "NO",
        "X-UI-Out-Filterresults": "notjunk:1; V03:K0:AvK+Xr+RPqM=:uTCUxUm5WCtVojhqbVp/O5\n\tEpAx/tGI0maJ0sBTiUV5L37Jw9tGSPzqCwpXW4jnQIcpI4wTKwikcCRu/lTUfKzD7jQEhVw2K\n\to/4PgRYV2KEJhtLsqyCamUr3wxiRsIekAdtI8BRKJwR+xvhOyIYHJ+MthtwDpVO+ZXhjTR2JB\n\tyMYu/ow4m/HInp5u0tLBncBmZhZc4Xgdisw9FmmviWFSqn26rqHxCtzOvRwWOwpDx/h7RDgy3\n\tHrnrwwwp0ZMcSqvDPfP0Hc4qfGzTYXQdGrdrDylyYiG7HvYk7SRNKS+QQCNJ4U74mtaNwR1Mn\n\t41VpoXHp/UrWLTVZPBkimPPmQ+c58CrPwDs/CWJBJpc75/zDEkHuhI08HntrfUC3J/GWvRP7f\n\tf+SNAOFS5Alij4M7lmuXmfgfKzeSnXXf04gEhM/fKuWepVrSDFTfVLuwGTIWsZ7x78m2VTH71\n\tUiRD9TSUi65UbmE4aW0W/MFZeQwGhjuGG4Mv9mfzdSTzh7iV7d6Uevm8t3QSq2C6z25omvi5k\n\tFoCMxGTzsJXsBf9tAvLrMLi49KiGkft9YkrqBF+HeQXrjcfnchekAXk6zL7cDu+UFzYb9kMXC\n\tQo+OzZs798O4EdN8/pun1W/1/U5h5beh9lW2db9R1QtsM84t5mIR2JAW5N5CuK4YITw4PKt/j\n\tJ8xBZFWv5j97yv9J2b0zbOTiJzYheYwaNraXWBN1CK8jTUTTCUfMlRfhV79p8geC3m5gx4bry\n\t6pIkwk/b2dANmLOoaOgeHS0Ay+Xwpbf7zpzLguAIXHoK9KiRk4WuNL9BYojR1LeLsCsMa55W3\n\tbMM9KW5S+5OFs1Cxuc95MYsZAdQb6Mz3mI5s04G12MTehzbj9COxE/CJiVDuDhwaElxmLDBd5\n\t5oNtgsjZq6AA9IamGHwf1LLCBnZr/EtDwYTXZJ7hA+K6MpTuh+QQVIRtRbvpyGYvasNOOW/0C\n\tL/RnU2Ci067b4rlQ4Rb2MXKL4V/8+vdDuK5uQxKn6mJYtTqvwpr53m3pxnc+XgdqJyxBdPFXo\n\tGIYyIElOjsCUcdAjESpZqp5MwmD8dwrgRuHnjMDVsTRWCeDb7oxRQRZiitP5X+12wpjzSvV9h\n\te/v8Zwn/oI7pP9CQQd2r7f59gsPlp1b/7Pu/lhU+8uoXcwnEAvayOlCdA==",
        "Subject": "[libcamera-devel] [PATCH v9 1/4] libcamera: controls: Use\n\tstd::optional to handle invalid control values",
        "X-BeenThere": "libcamera-devel@lists.libcamera.org",
        "X-Mailman-Version": "2.1.29",
        "Precedence": "list",
        "List-Id": "<libcamera-devel.lists.libcamera.org>",
        "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>",
        "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>",
        "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>",
        "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>",
        "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>",
        "From": "Christian Rauch via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>",
        "Reply-To": "Christian Rauch <Rauch.Christian@gmx.de>",
        "Errors-To": "libcamera-devel-bounces@lists.libcamera.org",
        "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"
    },
    "content": "Previously, ControlList::get<T>() would use default constructed objects to\nindicate that a ControlList does not have the requested Control. This has\nseveral disadvantages: 1) It requires types to be default constructible,\n2) it does not differentiate between a default constructed object and an\nobject that happens to have the same state as a default constructed object.\n\nstd::optional<T> additionally stores the information if the object is valid\nor not, and therefore is more expressive than a default constructed object.\n\nSigned-off-by: Christian Rauch <Rauch.Christian@gmx.de>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n include/libcamera/controls.h                  |  5 +++--\n src/android/camera_capabilities.cpp           | 12 +++++-----\n src/android/camera_device.cpp                 | 21 +++++++++---------\n src/android/camera_hal_manager.cpp            |  2 +-\n src/cam/main.cpp                              |  4 ++--\n src/gstreamer/gstlibcamerasrc.cpp             |  2 +-\n src/ipa/raspberrypi/raspberrypi.cpp           |  2 +-\n src/libcamera/pipeline/ipu3/ipu3.cpp          |  9 ++++----\n .../pipeline/raspberrypi/raspberrypi.cpp      |  9 ++++----\n src/qcam/dng_writer.cpp                       | 22 +++++++++----------\n 10 files changed, 44 insertions(+), 44 deletions(-)\n\n--\n2.34.1",
    "diff": "diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex 665bcac1..192be784 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -8,6 +8,7 @@\n #pragma once\n\n #include <assert.h>\n+#include <optional>\n #include <set>\n #include <stdint.h>\n #include <string>\n@@ -373,11 +374,11 @@ public:\n \tbool contains(unsigned int id) const;\n\n \ttemplate<typename T>\n-\tT get(const Control<T> &ctrl) const\n+\tstd::optional<T> get(const Control<T> &ctrl) const\n \t{\n \t\tconst ControlValue *val = find(ctrl.id());\n \t\tif (!val)\n-\t\t\treturn T{};\n+\t\t\treturn std::nullopt;\n\n \t\treturn val->get<T>();\n \t}\ndiff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex 6f197eb8..5304b2da 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -1042,7 +1042,7 @@ int CameraCapabilities::initializeStaticMetadata()\n \t/* Sensor static metadata. */\n \tstd::array<int32_t, 2> pixelArraySize;\n \t{\n-\t\tconst Size &size = properties.get(properties::PixelArraySize);\n+\t\tconst Size &size = properties.get(properties::PixelArraySize).value_or(Size{});\n \t\tpixelArraySize[0] = size.width;\n \t\tpixelArraySize[1] = size.height;\n \t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,\n@@ -1050,10 +1050,10 @@ int CameraCapabilities::initializeStaticMetadata()\n \t}\n\n \tif (properties.contains(properties::UnitCellSize)) {\n-\t\tconst Size &cellSize = properties.get<Size>(properties::UnitCellSize);\n+\t\tconst auto &cellSize = properties.get<Size>(properties::UnitCellSize);\n \t\tstd::array<float, 2> physicalSize{\n-\t\t\tcellSize.width * pixelArraySize[0] / 1e6f,\n-\t\t\tcellSize.height * pixelArraySize[1] / 1e6f\n+\t\t\tcellSize->width * pixelArraySize[0] / 1e6f,\n+\t\t\tcellSize->height * pixelArraySize[1] / 1e6f\n \t\t};\n \t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_PHYSICAL_SIZE,\n \t\t\t\t\t  physicalSize);\n@@ -1061,7 +1061,7 @@ int CameraCapabilities::initializeStaticMetadata()\n\n \t{\n \t\tconst Span<const Rectangle> &rects =\n-\t\t\tproperties.get(properties::PixelArrayActiveAreas);\n+\t\t\tproperties.get(properties::PixelArrayActiveAreas).value_or(Span<const Rectangle>{});\n \t\tstd::vector<int32_t> data{\n \t\t\tstatic_cast<int32_t>(rects[0].x),\n \t\t\tstatic_cast<int32_t>(rects[0].y),\n@@ -1080,7 +1080,7 @@ int CameraCapabilities::initializeStaticMetadata()\n\n \t/* Report the color filter arrangement if the camera reports it. */\n \tif (properties.contains(properties::draft::ColorFilterArrangement)) {\n-\t\tuint8_t filterArr = properties.get(properties::draft::ColorFilterArrangement);\n+\t\tuint8_t filterArr = *properties.get(properties::draft::ColorFilterArrangement);\n \t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT,\n \t\t\t\t\t  filterArr);\n \t}\ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 8c039fb9..46621232 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -306,7 +306,7 @@ int CameraDevice::initialize(const CameraConfigData *cameraConfigData)\n \tconst ControlList &properties = camera_->properties();\n\n \tif (properties.contains(properties::Location)) {\n-\t\tint32_t location = properties.get(properties::Location);\n+\t\tint32_t location = *properties.get(properties::Location);\n \t\tswitch (location) {\n \t\tcase properties::CameraLocationFront:\n \t\t\tfacing_ = CAMERA_FACING_FRONT;\n@@ -356,7 +356,7 @@ int CameraDevice::initialize(const CameraConfigData *cameraConfigData)\n \t * metadata.\n \t */\n \tif (properties.contains(properties::Rotation)) {\n-\t\tint rotation = properties.get(properties::Rotation);\n+\t\tint rotation = *properties.get(properties::Rotation);\n \t\torientation_ = (360 - rotation) % 360;\n \t\tif (cameraConfigData && cameraConfigData->rotation != -1 &&\n \t\t    orientation_ != cameraConfigData->rotation) {\n@@ -1181,7 +1181,8 @@ void CameraDevice::requestComplete(Request *request)\n \t * as soon as possible, earlier than request completion time.\n \t */\n \tuint64_t sensorTimestamp = static_cast<uint64_t>(request->metadata()\n-\t\t\t\t\t\t\t .get(controls::SensorTimestamp));\n+\t\t\t\t\t\t\t\t .get(controls::SensorTimestamp)\n+\t\t\t\t\t\t\t\t .value_or(0));\n \tnotifyShutter(descriptor->frameNumber_, sensorTimestamp);\n\n \tLOG(HAL, Debug) << \"Request \" << request->cookie() << \" completed with \"\n@@ -1560,29 +1561,28 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\n \t\t\t\t rolling_shutter_skew);\n\n \t/* Add metadata tags reported by libcamera. */\n-\tconst int64_t timestamp = metadata.get(controls::SensorTimestamp);\n+\tconst int64_t timestamp = metadata.get(controls::SensorTimestamp).value_or(0);\n \tresultMetadata->addEntry(ANDROID_SENSOR_TIMESTAMP, timestamp);\n\n \tif (metadata.contains(controls::draft::PipelineDepth)) {\n-\t\tuint8_t pipeline_depth =\n-\t\t\tmetadata.get<int32_t>(controls::draft::PipelineDepth);\n+\t\tuint8_t pipeline_depth = *metadata.get<int32_t>(controls::draft::PipelineDepth);\n \t\tresultMetadata->addEntry(ANDROID_REQUEST_PIPELINE_DEPTH,\n \t\t\t\t\t pipeline_depth);\n \t}\n\n \tif (metadata.contains(controls::ExposureTime)) {\n-\t\tint64_t exposure = metadata.get(controls::ExposureTime) * 1000ULL;\n+\t\tint64_t exposure = *metadata.get(controls::ExposureTime) * 1000ULL;\n \t\tresultMetadata->addEntry(ANDROID_SENSOR_EXPOSURE_TIME, exposure);\n \t}\n\n \tif (metadata.contains(controls::FrameDuration)) {\n-\t\tint64_t duration = metadata.get(controls::FrameDuration) * 1000;\n+\t\tint64_t duration = *metadata.get(controls::FrameDuration) * 1000;\n \t\tresultMetadata->addEntry(ANDROID_SENSOR_FRAME_DURATION,\n \t\t\t\t\t duration);\n \t}\n\n \tif (metadata.contains(controls::ScalerCrop)) {\n-\t\tRectangle crop = metadata.get(controls::ScalerCrop);\n+\t\tRectangle crop = *metadata.get(controls::ScalerCrop);\n \t\tint32_t cropRect[] = {\n \t\t\tcrop.x, crop.y, static_cast<int32_t>(crop.width),\n \t\t\tstatic_cast<int32_t>(crop.height),\n@@ -1591,8 +1591,7 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\n \t}\n\n \tif (metadata.contains(controls::draft::TestPatternMode)) {\n-\t\tconst int32_t testPatternMode =\n-\t\t\tmetadata.get(controls::draft::TestPatternMode);\n+\t\tconst int32_t testPatternMode = *metadata.get(controls::draft::TestPatternMode);\n \t\tresultMetadata->addEntry(ANDROID_SENSOR_TEST_PATTERN_MODE,\n \t\t\t\t\t testPatternMode);\n \t}\ndiff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\nindex 5f7bfe26..0bffe96f 100644\n--- a/src/android/camera_hal_manager.cpp\n+++ b/src/android/camera_hal_manager.cpp\n@@ -232,7 +232,7 @@ int32_t CameraHalManager::cameraLocation(const Camera *cam)\n \tif (!properties.contains(properties::Location))\n \t\treturn -1;\n\n-\treturn properties.get(properties::Location);\n+\treturn *properties.get(properties::Location);\n }\n\n CameraDevice *CameraHalManager::cameraDeviceFromHalId(unsigned int id)\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 79875ed7..d8115cd8 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -301,7 +301,7 @@ std::string CamApp::cameraName(const Camera *camera)\n \t * is only used if the location isn't present or is set to External.\n \t */\n \tif (props.contains(properties::Location)) {\n-\t\tswitch (props.get(properties::Location)) {\n+\t\tswitch (*props.get(properties::Location)) {\n \t\tcase properties::CameraLocationFront:\n \t\t\taddModel = false;\n \t\t\tname = \"Internal front camera \";\n@@ -321,7 +321,7 @@ std::string CamApp::cameraName(const Camera *camera)\n \t\t * If the camera location is not availble use the camera model\n \t\t * to build the camera name.\n \t\t */\n-\t\tname = \"'\" + props.get(properties::Model) + \"' \";\n+\t\tname = \"'\" + *props.get(properties::Model) + \"' \";\n \t}\n\n \tname += \"(\" + camera->id() + \")\";\ndiff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp\nindex a7a0c440..3d3efc0c 100644\n--- a/src/gstreamer/gstlibcamerasrc.cpp\n+++ b/src/gstreamer/gstlibcamerasrc.cpp\n@@ -234,7 +234,7 @@ GstLibcameraSrcState::requestCompleted(Request *request)\n \t}\n\n \tif (GST_ELEMENT_CLOCK(src_)) {\n-\t\tint64_t timestamp = request->metadata().get(controls::SensorTimestamp);\n+\t\tint64_t timestamp = request->metadata().get(controls::SensorTimestamp).value_or(0);\n\n \t\tGstClockTime gst_base_time = GST_ELEMENT(src_)->base_time;\n \t\tGstClockTime gst_now = gst_clock_get_time(GST_ELEMENT_CLOCK(src_));\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex f8d37b87..c7492a77 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -993,7 +993,7 @@ void IPARPi::returnEmbeddedBuffer(unsigned int bufferId)\n\n void IPARPi::prepareISP(const ISPConfig &data)\n {\n-\tint64_t frameTimestamp = data.controls.get(controls::SensorTimestamp);\n+\tint64_t frameTimestamp = data.controls.get(controls::SensorTimestamp).value_or(0);\n \tRPiController::Metadata lastMetadata;\n \tSpan<uint8_t> embeddedBuffer;\n\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex b7dda282..43db7b68 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -1145,7 +1145,7 @@ int PipelineHandlerIPU3::registerCameras()\n \t\t/* Convert the sensor rotation to a transformation */\n \t\tint32_t rotation = 0;\n \t\tif (data->properties_.contains(properties::Rotation))\n-\t\t\trotation = data->properties_.get(properties::Rotation);\n+\t\t\trotation = *(data->properties_.get(properties::Rotation));\n \t\telse\n \t\t\tLOG(IPU3, Warning) << \"Rotation control not exposed by \"\n \t\t\t\t\t   << cio2->sensor()->id()\n@@ -1331,7 +1331,7 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n \trequest->metadata().set(controls::draft::PipelineDepth, 3);\n \t/* \\todo Actually apply the scaler crop region to the ImgU. */\n \tif (request->controls().contains(controls::ScalerCrop))\n-\t\tcropRegion_ = request->controls().get(controls::ScalerCrop);\n+\t\tcropRegion_ = *(request->controls().get(controls::ScalerCrop));\n \trequest->metadata().set(controls::ScalerCrop, cropRegion_);\n\n \tif (frameInfos_.tryComplete(info))\n@@ -1424,7 +1424,7 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n \t\treturn;\n \t}\n\n-\tipa_->processStatsBuffer(info->id, request->metadata().get(controls::SensorTimestamp),\n+\tipa_->processStatsBuffer(info->id, request->metadata().get(controls::SensorTimestamp).value_or(0),\n \t\t\t\t info->statBuffer->cookie(), info->effectiveSensorControls);\n }\n\n@@ -1458,8 +1458,7 @@ void IPU3CameraData::frameStart(uint32_t sequence)\n \tif (!request->controls().contains(controls::draft::TestPatternMode))\n \t\treturn;\n\n-\tconst int32_t testPatternMode = request->controls().get(\n-\t\tcontrols::draft::TestPatternMode);\n+\tconst int32_t testPatternMode = *(request->controls().get(controls::draft::TestPatternMode));\n\n \tint ret = cio2_.sensor()->setTestPatternMode(\n \t\tstatic_cast<controls::draft::TestPatternModeEnum>(testPatternMode));\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 66a84b1d..28f054cb 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -364,7 +364,7 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n \t * error means the platform can never run. Let's just print a warning\n \t * and continue regardless; the rotation is effectively set to zero.\n \t */\n-\tint32_t rotation = data_->sensor_->properties().get(properties::Rotation);\n+\tint32_t rotation = data_->sensor_->properties().get(properties::Rotation).value_or(0);\n \tbool success;\n \tTransform rotationTransform = transformFromRotation(rotation, &success);\n \tif (!success)\n@@ -1717,7 +1717,8 @@ void RPiCameraData::statsMetadataComplete(uint32_t bufferId, const ControlList &\n \t * V4L2_CID_NOTIFY_GAINS control (which means notifyGainsUnity_ is set).\n \t */\n \tif (notifyGainsUnity_ && controls.contains(libcamera::controls::ColourGains)) {\n-\t\tlibcamera::Span<const float> colourGains = controls.get(libcamera::controls::ColourGains);\n+\t\tlibcamera::Span<const float> colourGains =\n+\t\t\t*controls.get(libcamera::controls::ColourGains);\n \t\t/* The control wants linear gains in the order B, Gb, Gr, R. */\n \t\tControlList ctrls(sensor_->controls());\n \t\tstd::array<int32_t, 4> gains{\n@@ -2052,7 +2053,7 @@ Rectangle RPiCameraData::scaleIspCrop(const Rectangle &ispCrop) const\n void RPiCameraData::applyScalerCrop(const ControlList &controls)\n {\n \tif (controls.contains(controls::ScalerCrop)) {\n-\t\tRectangle nativeCrop = controls.get<Rectangle>(controls::ScalerCrop);\n+\t\tRectangle nativeCrop = *controls.get<Rectangle>(controls::ScalerCrop);\n\n \t\tif (!nativeCrop.width || !nativeCrop.height)\n \t\t\tnativeCrop = { 0, 0, 1, 1 };\n@@ -2090,7 +2091,7 @@ void RPiCameraData::fillRequestMetadata(const ControlList &bufferControls,\n \t\t\t\t\tRequest *request)\n {\n \trequest->metadata().set(controls::SensorTimestamp,\n-\t\t\t\tbufferControls.get(controls::SensorTimestamp));\n+\t\t\t\tbufferControls.get(controls::SensorTimestamp).value_or(0));\n\n \trequest->metadata().set(controls::ScalerCrop, scalerCrop_);\n }\ndiff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp\nindex 34c8df5a..4b5d8276 100644\n--- a/src/qcam/dng_writer.cpp\n+++ b/src/qcam/dng_writer.cpp\n@@ -392,7 +392,7 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \tTIFFSetField(tif, TIFFTAG_MAKE, \"libcamera\");\n\n \tif (cameraProperties.contains(properties::Model)) {\n-\t\tstd::string model = cameraProperties.get(properties::Model);\n+\t\tstd::string model = *cameraProperties.get(properties::Model);\n \t\tTIFFSetField(tif, TIFFTAG_MODEL, model.c_str());\n \t\t/* \\todo set TIFFTAG_UNIQUECAMERAMODEL. */\n \t}\n@@ -438,16 +438,15 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \tconst double eps = 1e-2;\n\n \tif (metadata.contains(controls::ColourGains)) {\n-\t\tSpan<const float> const &colourGains = metadata.get(controls::ColourGains);\n-\t\tif (colourGains[0] > eps && colourGains[1] > eps) {\n-\t\t\twbGain = Matrix3d::diag(colourGains[0], 1, colourGains[1]);\n-\t\t\tneutral[0] = 1.0 / colourGains[0]; /* red */\n-\t\t\tneutral[2] = 1.0 / colourGains[1]; /* blue */\n+\t\tconst auto &colourGains = metadata.get(controls::ColourGains);\n+\t\tif ((*colourGains)[0] > eps && (*colourGains)[1] > eps) {\n+\t\t\twbGain = Matrix3d::diag((*colourGains)[0], 1, (*colourGains)[1]);\n+\t\t\tneutral[0] = 1.0 / (*colourGains)[0]; /* red */\n+\t\t\tneutral[2] = 1.0 / (*colourGains)[1]; /* blue */\n \t\t}\n \t}\n \tif (metadata.contains(controls::ColourCorrectionMatrix)) {\n-\t\tSpan<const float> const &coeffs = metadata.get(controls::ColourCorrectionMatrix);\n-\t\tMatrix3d ccmSupplied(coeffs);\n+\t\tMatrix3d ccmSupplied(*metadata.get(controls::ColourCorrectionMatrix));\n \t\tif (ccmSupplied.determinant() > eps)\n \t\t\tccm = ccmSupplied;\n \t}\n@@ -515,7 +514,8 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \tuint32_t whiteLevel = (1 << info->bitsPerSample) - 1;\n\n \tif (metadata.contains(controls::SensorBlackLevels)) {\n-\t\tSpan<const int32_t> levels = metadata.get(controls::SensorBlackLevels);\n+\t\tSpan<const int32_t> levels =\n+\t\t\t*metadata.get(controls::SensorBlackLevels);\n\n \t\t/*\n \t\t * The black levels control is specified in R, Gr, Gb, B order.\n@@ -593,13 +593,13 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \tTIFFSetField(tif, EXIFTAG_DATETIMEDIGITIZED, strTime);\n\n \tif (metadata.contains(controls::AnalogueGain)) {\n-\t\tfloat gain = metadata.get(controls::AnalogueGain);\n+\t\tfloat gain = *metadata.get(controls::AnalogueGain);\n \t\tuint16_t iso = std::min(std::max(gain * 100, 0.0f), 65535.0f);\n \t\tTIFFSetField(tif, EXIFTAG_ISOSPEEDRATINGS, 1, &iso);\n \t}\n\n \tif (metadata.contains(controls::ExposureTime)) {\n-\t\tfloat exposureTime = metadata.get(controls::ExposureTime) / 1e6;\n+\t\tfloat exposureTime = *metadata.get(controls::ExposureTime) / 1e6;\n \t\tTIFFSetField(tif, EXIFTAG_EXPOSURETIME, exposureTime);\n \t}\n\n",
    "prefixes": [
        "libcamera-devel",
        "v9",
        "1/4"
    ]
}