{"id":16171,"url":"https://patchwork.libcamera.org/api/1.1/patches/16171/?format=json","web_url":"https://patchwork.libcamera.org/patch/16171/","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":"<20220604211148.188421-2-Rauch.Christian@gmx.de>","date":"2022-06-04T21:11:44","name":"[libcamera-devel,v7,1/5] libcamera: controls: Use std::optional to handle invalid control values","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"93d93eab6115195fcfe41a6be05715f62877db7f","submitter":{"id":111,"url":"https://patchwork.libcamera.org/api/1.1/people/111/?format=json","name":"Christian Rauch","email":"Rauch.Christian@gmx.de"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16171/mbox/","series":[{"id":3162,"url":"https://patchwork.libcamera.org/api/1.1/series/3162/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3162","date":"2022-06-04T21:11:43","name":"generate and use fixed-sized Span Control types","version":7,"mbox":"https://patchwork.libcamera.org/series/3162/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16171/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16171/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 CB2FDC326B\n\tfor ;\n\tSat, 4 Jun 2022 21:11:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F344E65642;\n\tSat, 4 Jun 2022 23:11:53 +0200 (CEST)","from mout.gmx.net (mout.gmx.net [212.227.15.19])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E27D9633A6\n\tfor ;\n\tSat, 4 Jun 2022 23:11:51 +0200 (CEST)","from localhost.localdomain ([92.18.80.244]) by mail.gmx.net\n\t(mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id\n\t1MHXBj-1o1m3q1Gb3-00DaXS; Sat, 04 Jun 2022 23:11:51 +0200"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1654377114;\n\tbh=pdxfYdSHR5Xzt/Pf3GlruiSWcGkUOHD/rcoIH9xhfJQ=;\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=PnjZvOnRoDUdke0elCyF8eqcQ50pmCQTW8uyFtYOUB742iWAFhrZ1ZMHKRnJle96D\n\tH7B/BsBiqjxXHhHTyp1SeAAI12U79JgBcw7eZ6h7GnOTjtz80Dh7861gNuYmo+ZwJy\n\t4B3Y4dxFw3NyB9pWTmoPW7TTlZ9Z2PLHGYwHvX86meHgolFT6JGCr6u3v9fuxxspfj\n\tWE6tCTqAnytZiBmE+cVC8RfWeTFHoGrWdZMFuW+AL1HiGYF0bMctcVG/vUK9sFfQCW\n\t7xVdccHNOsxDmVhy1HIN9IX0zGvnx0qFgQup9Z6FeyEywDqeNWlgW69N1tONFphm40\n\t2lAM/F83cqN5g==","v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;\n\ts=badeba3b8450; t=1654377111;\n\tbh=pdxfYdSHR5Xzt/Pf3GlruiSWcGkUOHD/rcoIH9xhfJQ=;\n\th=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;\n\tb=OZnR+jT3SIF/qYyOu4anDQi45a+aheH68gUW/MzFXqiVOpscd0cqCOWjN62CiULAR\n\t5rr4gK1UJ0z5gQLEMe7QoVgvD5/oi1ra4vYnpYOnJxEkGm8n3yN54wZGCo8AFR36pJ\n\tMeJYgqylgudn0QybdSJpk3ruDbwnysb+eEjw3J28="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=gmx.net header.i=@gmx.net\n\theader.b=\"OZnR+jT3\"; dkim-atps=neutral","X-UI-Sender-Class":"01bb95c1-4bf8-414a-932a-4f6e2808ef9c","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 4 Jun 2022 22:11:44 +0100","Message-Id":"<20220604211148.188421-2-Rauch.Christian@gmx.de>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220604211148.188421-1-Rauch.Christian@gmx.de>","References":"<20220604211148.188421-1-Rauch.Christian@gmx.de>","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","X-Provags-ID":"V03:K1:5AS387TAGgUs/b9TPTkBuhZQa1CTnQjOyuMaoBH7yCWMxu89vo2\n\tVOFDG1Vrtb8GTHoJAnRdH0imVLCMYx3d7me1R4qdnUuUfc0mH0pUxVylTNx6AJPDw38He7N\n\tve0xNUJMW7oFQkRtxRJbQ+A3t6NMaVF5UybRpebIQ//JptZDCzSGbgEkkr3S57vSJttpOzb\n\tbqFEOdvBg5zsZsSFBIUZA==","X-Spam-Flag":"NO","X-UI-Out-Filterresults":"notjunk:1; V03:K0:E6YXtxvBayU=:gU6PJxRRj9W5ox71NYn5kR\n\tLcRU4V1Q+FBp7aENvg29LpP5vOi4rQ4IYCYe9zbC4hkBfG1NzPuDaQhOC+ke4Job+9tM8wO/A\n\tJ7hLiDxkyMGAeZ8d9JcWocP3IvayOa3GU2nA9bonPdItf8RHu+VPz+F0SYgD25c8zEvtXOU6M\n\tCC256fOaL7/JfWVXiTECKFqanAueKAI7jX2yg6roijTQkhrRSxAYxDJ3AMHj8LcQDCuV+3q9v\n\tcEVk2s6b6fFAG9f7xzvddg5DwrtB+6lv83Xh7ICRYupiPfAqP1tgYkJXDmeMaGmYjhmvtKEMU\n\tTcW45IvB60q5hKYluxV1YlL++glkrbXkhTker8ZpRtKPuaSJaBVEUaGVHVWxF4xvAM4LaIotC\n\tUFvwvpCwk5SH8cl4gtNu6aPLP2Zx0zKnQW0s8Yrb6IuuLJ2eeGXv1SN9qDfo8BZRUhr0oTbHo\n\te+3p2agORI6EC9KffgaFjmeo0oTlkDhZEcprnfFu2S8VjPNMIvhkk2txorkXd2bkUg+n3wAlS\n\t5yiu0R60bMza8WtozccqzUZLZFdUOjDjciy0fmaTHjDvb4KGRExHkAPP+Fl81YVatwAe+W5uE\n\tsU5V/4GuCEzHJlJvay32FvLl7NOO93A4kp4TU9c/ucpeS39DfoYC38TMMSAOxQp397GkeJv9E\n\tsdgdhUnz5ghbH4cutIJzBsRfDHh82TMKVOk+UoUAzK9+6ztTjBjySeAfK3yS8xgj5SGkUzdpF\n\tyK5zVFV1qjEFMTj4lFUwKkbmNK/dvWFCRXjxkWhiSA4MNnl8h28Sv6JVahrgIIq8Z3luUfD/X\n\tITkBJkP/IQG9hPQZlz9YsmfIU1XeFMgAA8T4cMCOpnK9E5/zq/lygNJKzE4AAo39k45ovPOpH\n\t9NadOYobNhuhqXqDxHQZNkNQ6K7aGI4VaQg13jMYA/R0jG7GuBs51cy2aAMHwUHV1yOlAcngp\n\t5YfZKb6RN3aWeK1xr6zfK0D/E+lc55Pyc2QUp6XukrgxzRhGCoQIpIvpqxNLKElXvv1x8dXzZ\n\tv4BhLLKvViYumNQ/poliKrlGrhG0xZLy2gAemJPLvuetiMqddQaTfoNLqmLnvpWki4qsJqDqA\n\to0VPrwTqBh9u7Uek2VLTj26Zqb0wB7cRnSAfmTcRrRWlS0t8Yg76/2NkA==","Subject":"[libcamera-devel] [PATCH v7 1/5] 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Christian Rauch via libcamera-devel\n\t","Reply-To":"Christian Rauch ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Previously, ControlList::get() 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 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 \nReviewed-by: Jacopo Mondi \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/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 9 files changed, 43 insertions(+), 43 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 \n+#include \n #include \n #include \n #include \n@@ -373,11 +374,11 @@ public:\n \tbool contains(unsigned int id) const;\n\n \ttemplate\n-\tT get(const Control &ctrl) const\n+\tstd::optional get(const Control &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();\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 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(properties::UnitCellSize);\n+\t\tconst auto &cellSize = properties.get(properties::UnitCellSize);\n \t\tstd::array 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 &rects =\n-\t\t\tproperties.get(properties::PixelArrayActiveAreas);\n+\t\t\tproperties.get(properties::PixelArrayActiveAreas).value_or(Span{});\n \t\tstd::vector data{\n \t\t\tstatic_cast(rects[0].x),\n \t\t\tstatic_cast(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 8e804d4d..ec117101 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -305,7 +305,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@@ -355,7 +355,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@@ -1094,7 +1094,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(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@@ -1473,29 +1474,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(controls::draft::PipelineDepth);\n+\t\tuint8_t pipeline_depth = *metadata.get(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(crop.width),\n \t\t\tstatic_cast(crop.height),\n@@ -1504,8 +1504,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/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 3b126bb5..f65a0680 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -939,7 +939,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 embeddedBuffer;\n\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex fd989e61..9d9ea138 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(testPatternMode));\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex adc397e8..a62afdd4 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -365,7 +365,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@@ -1706,7 +1706,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 colourGains = controls.get(libcamera::controls::ColourGains);\n+\t\tlibcamera::Span 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 gains{\n@@ -2041,7 +2042,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(controls::ScalerCrop);\n+\t\tRectangle nativeCrop = *controls.get(controls::ScalerCrop);\n\n \t\tif (!nativeCrop.width || !nativeCrop.height)\n \t\t\tnativeCrop = { 0, 0, 1, 1 };\n@@ -2079,7 +2080,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 &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 &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 levels = metadata.get(controls::SensorBlackLevels);\n+\t\tSpan 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","v7","1/5"]}