Patch Detail
Show a patch.
GET /api/patches/16626/?format=api
{ "id": 16626, "url": "https://patchwork.libcamera.org/api/patches/16626/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16626/", "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": "<20220714095334.9064-1-laurent.pinchart@ideasonboard.com>", "date": "2022-07-14T09:53:34", "name": "[libcamera-devel,v3] libcamera: controls: Avoid double lookups", "commit_ref": "f995ff25a3326db90513d1fa936815653f7cade0", "pull_url": null, "state": "accepted", "archived": false, "hash": "2249dfa93d9d0c1dbfb87d94a82bdfc72df4b67d", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/16626/mbox/", "series": [ { "id": 3284, "url": "https://patchwork.libcamera.org/api/series/3284/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3284", "date": "2022-07-14T09:53:34", "name": "[libcamera-devel,v3] libcamera: controls: Avoid double lookups", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3284/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16626/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16626/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 A2E1EBE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 14 Jul 2022 09:54:14 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0162163312;\n\tThu, 14 Jul 2022 11:54:13 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F27A163309\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 14 Jul 2022 11:54:12 +0200 (CEST)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 63F1A383;\n\tThu, 14 Jul 2022 11:54:12 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1657792454;\n\tbh=VJIJt2p+kaXtXEWJGin/3fyNmbol7/CJP3cHWhsYgqM=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=Qe93C4tESz1352lJwrOn1+TLezjXWxPBy+wJLbNeoHF0QfJmBpG4MROrgU++EOmlY\n\tYw6bKbutjx5Gka/LDzmTDcWbAB9iujiA5z7SzF4LtzPt511OPcWfSlGus47hoj5wLN\n\tzra4Xtq8isuSJ4Ha0p2ZXmmATUpsfVB21nFfuX3J8vzUd/XiYgS2lJYyywT3OdccX3\n\tk2XB/9Y0chzfJWdgkfui9Ey/Z8496t2DYSLLvf1/hmXmtfJCmmEYMY3T4H8ihK6qN2\n\tuJn8S0hqw61sjgydTOp5dW8SfYWD6sngFEa7hd3TinLzSm+GuEGE+oYHl08Etmwcgx\n\t9/VmIpWlt8tbg==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1657792452;\n\tbh=VJIJt2p+kaXtXEWJGin/3fyNmbol7/CJP3cHWhsYgqM=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=WgwqaMaFy9MbtVKbBOcjmF2kk+/3X5vSQXXpLpZ1fITQIeyrPX3Ubc36vY9Spk8U+\n\t/dROgnax15q8LVUTcfsHkrzIm2D3JltlDIMUfj2fp0O3ZZaXMeUaAUVyPTcIGNg209\n\tv8l11xlzVNCOfC4mg3zkMEhzuquTxdCymZmm2sX4=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"WgwqaMaF\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 14 Jul 2022 12:53:34 +0300", "Message-Id": "<20220714095334.9064-1-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.35.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3] libcamera: controls: Avoid double\n\tlookups", "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": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Now that the ControlList::get() function returns an instance of\nstd::optional<>, we can replace the ControlList::contains() calls with a\nnullopt check on the return value of get(). This avoids double lookups\nof controls through the code base.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Umang Jain <umang.jain@ideasonboard.com>\n---\nChanges since v2:\n\n- Add missing reference for const auto &model\n\nChanges since v1:\n\n- Remove one more contains() call in src/cam/main.cpp\n---\nThis patch applies on top of \"[PATCH v10 1/2] libcamera: controls: Use\nstd::optional to handle invalid control values\".\n---\n src/android/camera_capabilities.cpp | 11 ++---\n src/android/camera_device.cpp | 46 +++++++++----------\n src/android/camera_hal_manager.cpp | 6 +--\n src/cam/main.cpp | 11 +++--\n src/libcamera/pipeline/ipu3/ipu3.cpp | 25 +++++-----\n .../pipeline/raspberrypi/raspberrypi.cpp | 14 +++---\n src/qcam/dng_writer.cpp | 35 +++++++-------\n 7 files changed, 72 insertions(+), 76 deletions(-)", "diff": "diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex 5304b2da1f93..94ebfc860040 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -1049,8 +1049,8 @@ int CameraCapabilities::initializeStaticMetadata()\n \t\t\t\t\t pixelArraySize);\n \t}\n \n-\tif (properties.contains(properties::UnitCellSize)) {\n-\t\tconst auto &cellSize = properties.get<Size>(properties::UnitCellSize);\n+\tconst auto &cellSize = properties.get<Size>(properties::UnitCellSize);\n+\tif (cellSize) {\n \t\tstd::array<float, 2> physicalSize{\n \t\t\tcellSize->width * pixelArraySize[0] / 1e6f,\n \t\t\tcellSize->height * pixelArraySize[1] / 1e6f\n@@ -1079,11 +1079,10 @@ int CameraCapabilities::initializeStaticMetadata()\n \t\t\t\t sensitivityRange);\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+\tconst auto &filterArr = properties.get(properties::draft::ColorFilterArrangement);\n+\tif (filterArr)\n \t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT,\n-\t\t\t\t\t filterArr);\n-\t}\n+\t\t\t\t\t *filterArr);\n \n \tconst auto &exposureInfo = controlsInfo.find(&controls::ExposureTime);\n \tif (exposureInfo != controlsInfo.end()) {\ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 4662123210c2..b20e389b9d30 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -305,9 +305,9 @@ int CameraDevice::initialize(const CameraConfigData *cameraConfigData)\n \t */\n \tconst ControlList &properties = camera_->properties();\n \n-\tif (properties.contains(properties::Location)) {\n-\t\tint32_t location = *properties.get(properties::Location);\n-\t\tswitch (location) {\n+\tconst auto &location = properties.get(properties::Location);\n+\tif (location) {\n+\t\tswitch (*location) {\n \t\tcase properties::CameraLocationFront:\n \t\t\tfacing_ = CAMERA_FACING_FRONT;\n \t\t\tbreak;\n@@ -355,9 +355,9 @@ int CameraDevice::initialize(const CameraConfigData *cameraConfigData)\n \t * value for clockwise direction as required by the Android orientation\n \t * metadata.\n \t */\n-\tif (properties.contains(properties::Rotation)) {\n-\t\tint rotation = *properties.get(properties::Rotation);\n-\t\torientation_ = (360 - rotation) % 360;\n+\tconst auto &rotation = properties.get(properties::Rotation);\n+\tif (rotation) {\n+\t\torientation_ = (360 - *rotation) % 360;\n \t\tif (cameraConfigData && cameraConfigData->rotation != -1 &&\n \t\t orientation_ != cameraConfigData->rotation) {\n \t\t\tLOG(HAL, Warning)\n@@ -1564,25 +1564,24 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\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 = *metadata.get<int32_t>(controls::draft::PipelineDepth);\n+\tconst auto &pipelineDepth = metadata.get(controls::draft::PipelineDepth);\n+\tif (pipelineDepth)\n \t\tresultMetadata->addEntry(ANDROID_REQUEST_PIPELINE_DEPTH,\n-\t\t\t\t\t pipeline_depth);\n-\t}\n+\t\t\t\t\t *pipelineDepth);\n \n-\tif (metadata.contains(controls::ExposureTime)) {\n-\t\tint64_t exposure = *metadata.get(controls::ExposureTime) * 1000ULL;\n-\t\tresultMetadata->addEntry(ANDROID_SENSOR_EXPOSURE_TIME, exposure);\n-\t}\n+\tconst auto &exposureTime = metadata.get(controls::ExposureTime);\n+\tif (exposureTime)\n+\t\tresultMetadata->addEntry(ANDROID_SENSOR_EXPOSURE_TIME,\n+\t\t\t\t\t *exposureTime * 1000ULL);\n \n-\tif (metadata.contains(controls::FrameDuration)) {\n-\t\tint64_t duration = *metadata.get(controls::FrameDuration) * 1000;\n+\tconst auto &frameDuration = metadata.get(controls::FrameDuration);\n+\tif (frameDuration)\n \t\tresultMetadata->addEntry(ANDROID_SENSOR_FRAME_DURATION,\n-\t\t\t\t\t duration);\n-\t}\n+\t\t\t\t\t *frameDuration * 1000);\n \n-\tif (metadata.contains(controls::ScalerCrop)) {\n-\t\tRectangle crop = *metadata.get(controls::ScalerCrop);\n+\tconst auto &scalerCrop = metadata.get(controls::ScalerCrop);\n+\tif (scalerCrop) {\n+\t\tconst Rectangle &crop = *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@@ -1590,11 +1589,10 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\n \t\tresultMetadata->addEntry(ANDROID_SCALER_CROP_REGION, cropRect);\n \t}\n \n-\tif (metadata.contains(controls::draft::TestPatternMode)) {\n-\t\tconst int32_t testPatternMode = *metadata.get(controls::draft::TestPatternMode);\n+\tconst auto &testPatternMode = metadata.get(controls::draft::TestPatternMode);\n+\tif (testPatternMode)\n \t\tresultMetadata->addEntry(ANDROID_SENSOR_TEST_PATTERN_MODE,\n-\t\t\t\t\t testPatternMode);\n-\t}\n+\t\t\t\t\t *testPatternMode);\n \n \t/*\n \t * Return the result metadata pack even is not valid: get() will return\ndiff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\nindex 0bffe96f6dbc..7512cc4e11a4 100644\n--- a/src/android/camera_hal_manager.cpp\n+++ b/src/android/camera_hal_manager.cpp\n@@ -228,11 +228,7 @@ void CameraHalManager::cameraRemoved(std::shared_ptr<Camera> cam)\n \n int32_t CameraHalManager::cameraLocation(const Camera *cam)\n {\n-\tconst ControlList &properties = cam->properties();\n-\tif (!properties.contains(properties::Location))\n-\t\treturn -1;\n-\n-\treturn *properties.get(properties::Location);\n+\treturn cam->properties().get(properties::Location).value_or(-1);\n }\n \n CameraDevice *CameraHalManager::cameraDeviceFromHalId(unsigned int id)\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex d8115cd86825..53c2ffde95ba 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -300,8 +300,9 @@ std::string CamApp::cameraName(const Camera *camera)\n \t * Construct the name from the camera location, model and ID. The model\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+\tconst auto &location = props.get(properties::Location);\n+\tif (location) {\n+\t\tswitch (*location) {\n \t\tcase properties::CameraLocationFront:\n \t\t\taddModel = false;\n \t\t\tname = \"Internal front camera \";\n@@ -316,12 +317,14 @@ std::string CamApp::cameraName(const Camera *camera)\n \t\t}\n \t}\n \n-\tif (addModel && props.contains(properties::Model)) {\n+\tif (addModel) {\n \t\t/*\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\tconst auto &model = props.get(properties::Model);\n+\t\tif (model)\n+\t\t\tname = \"'\" + *model + \"' \";\n \t}\n \n \tname += \"(\" + camera->id() + \")\";\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 43db7b68dac8..d60f20b08e27 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -1143,18 +1143,17 @@ int PipelineHandlerIPU3::registerCameras()\n \t\t\t\t\t\t &IPU3CameraData::frameStart);\n \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\telse\n+\t\tconst auto &rotation = data->properties_.get(properties::Rotation);\n+\t\tif (!rotation)\n \t\t\tLOG(IPU3, Warning) << \"Rotation control not exposed by \"\n \t\t\t\t\t << cio2->sensor()->id()\n \t\t\t\t\t << \". Assume rotation 0\";\n \n+\t\tint32_t rotationValue = rotation.value_or(0);\n \t\tbool success;\n-\t\tdata->rotationTransform_ = transformFromRotation(rotation, &success);\n+\t\tdata->rotationTransform_ = transformFromRotation(rotationValue, &success);\n \t\tif (!success)\n-\t\t\tLOG(IPU3, Warning) << \"Invalid rotation of \" << rotation\n+\t\t\tLOG(IPU3, Warning) << \"Invalid rotation of \" << rotationValue\n \t\t\t\t\t << \" degrees: ignoring\";\n \n \t\tControlList ctrls = cio2->sensor()->getControls({ V4L2_CID_HFLIP });\n@@ -1330,8 +1329,9 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n \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+\tconst auto &scalerCrop = request->controls().get(controls::ScalerCrop);\n+\tif (scalerCrop)\n+\t\tcropRegion_ = *scalerCrop;\n \trequest->metadata().set(controls::ScalerCrop, cropRegion_);\n \n \tif (frameInfos_.tryComplete(info))\n@@ -1455,13 +1455,12 @@ void IPU3CameraData::frameStart(uint32_t sequence)\n \tRequest *request = processingRequests_.front();\n \tprocessingRequests_.pop();\n \n-\tif (!request->controls().contains(controls::draft::TestPatternMode))\n+\tconst auto &testPatternMode = request->controls().get(controls::draft::TestPatternMode);\n+\tif (!testPatternMode)\n \t\treturn;\n \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));\n+\t\tstatic_cast<controls::draft::TestPatternModeEnum>(*testPatternMode));\n \tif (ret) {\n \t\tLOG(IPU3, Error) << \"Failed to set test pattern mode: \"\n \t\t\t\t << ret;\n@@ -1469,7 +1468,7 @@ void IPU3CameraData::frameStart(uint32_t sequence)\n \t}\n \n \trequest->metadata().set(controls::draft::TestPatternMode,\n-\t\t\t\ttestPatternMode);\n+\t\t\t\t*testPatternMode);\n }\n \n REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3)\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 28f054cb84c8..2e19531eecc4 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -1716,16 +1716,15 @@ void RPiCameraData::statsMetadataComplete(uint32_t bufferId, const ControlList &\n \t * Inform the sensor of the latest colour gains if it has the\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 =\n-\t\t\t*controls.get(libcamera::controls::ColourGains);\n+\tconst auto &colourGains = controls.get(libcamera::controls::ColourGains);\n+\tif (notifyGainsUnity_ && 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-\t\t\tstatic_cast<int32_t>(colourGains[1] * *notifyGainsUnity_),\n+\t\t\tstatic_cast<int32_t>((*colourGains)[1] * *notifyGainsUnity_),\n \t\t\t*notifyGainsUnity_,\n \t\t\t*notifyGainsUnity_,\n-\t\t\tstatic_cast<int32_t>(colourGains[0] * *notifyGainsUnity_)\n+\t\t\tstatic_cast<int32_t>((*colourGains)[0] * *notifyGainsUnity_)\n \t\t};\n \t\tctrls.set(V4L2_CID_NOTIFY_GAINS, Span<const int32_t>{ gains });\n \n@@ -2052,8 +2051,9 @@ Rectangle RPiCameraData::scaleIspCrop(const Rectangle &ispCrop) const\n \n void RPiCameraData::applyScalerCrop(const ControlList &controls)\n {\n-\tif (controls.contains(controls::ScalerCrop)) {\n-\t\tRectangle nativeCrop = *controls.get<Rectangle>(controls::ScalerCrop);\n+\tconst auto &scalerCrop = controls.get<Rectangle>(controls::ScalerCrop);\n+\tif (scalerCrop) {\n+\t\tRectangle nativeCrop = *scalerCrop;\n \n \t\tif (!nativeCrop.width || !nativeCrop.height)\n \t\t\tnativeCrop = { 0, 0, 1, 1 };\ndiff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp\nindex 4b5d8276564f..5896485cda5b 100644\n--- a/src/qcam/dng_writer.cpp\n+++ b/src/qcam/dng_writer.cpp\n@@ -391,9 +391,9 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \tTIFFSetField(tif, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB);\n \tTIFFSetField(tif, TIFFTAG_MAKE, \"libcamera\");\n \n-\tif (cameraProperties.contains(properties::Model)) {\n-\t\tstd::string model = *cameraProperties.get(properties::Model);\n-\t\tTIFFSetField(tif, TIFFTAG_MODEL, model.c_str());\n+\tconst auto &model = cameraProperties.get(properties::Model);\n+\tif (model) {\n+\t\tTIFFSetField(tif, TIFFTAG_MODEL, model->c_str());\n \t\t/* \\todo set TIFFTAG_UNIQUECAMERAMODEL. */\n \t}\n \n@@ -437,16 +437,18 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \t */\n \tconst double eps = 1e-2;\n \n-\tif (metadata.contains(controls::ColourGains)) {\n-\t\tconst auto &colourGains = metadata.get(controls::ColourGains);\n+\tconst auto &colourGains = metadata.get(controls::ColourGains);\n+\tif (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\tMatrix3d ccmSupplied(*metadata.get(controls::ColourCorrectionMatrix));\n+\n+\tconst auto &ccmControl = metadata.get(controls::ColourCorrectionMatrix);\n+\tif (ccmControl) {\n+\t\tMatrix3d ccmSupplied(*ccmControl);\n \t\tif (ccmSupplied.determinant() > eps)\n \t\t\tccm = ccmSupplied;\n \t}\n@@ -513,9 +515,9 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \tfloat blackLevel[] = { 0.0f, 0.0f, 0.0f, 0.0f };\n \tuint32_t whiteLevel = (1 << info->bitsPerSample) - 1;\n \n-\tif (metadata.contains(controls::SensorBlackLevels)) {\n-\t\tSpan<const int32_t> levels =\n-\t\t\t*metadata.get(controls::SensorBlackLevels);\n+\tconst auto &blackLevels = metadata.get(controls::SensorBlackLevels);\n+\tif (blackLevels) {\n+\t\tSpan<const int32_t> levels = *blackLevels;\n \n \t\t/*\n \t\t * The black levels control is specified in R, Gr, Gb, B order.\n@@ -592,16 +594,15 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \tTIFFSetField(tif, EXIFTAG_DATETIMEORIGINAL, strTime);\n \tTIFFSetField(tif, EXIFTAG_DATETIMEDIGITIZED, strTime);\n \n-\tif (metadata.contains(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+\tconst auto &analogGain = metadata.get(controls::AnalogueGain);\n+\tif (analogGain) {\n+\t\tuint16_t iso = std::min(std::max(*analogGain * 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\tTIFFSetField(tif, EXIFTAG_EXPOSURETIME, exposureTime);\n-\t}\n+\tconst auto &exposureTime = metadata.get(controls::ExposureTime);\n+\tif (exposureTime)\n+\t\tTIFFSetField(tif, EXIFTAG_EXPOSURETIME, *exposureTime / 1e6);\n \n \tTIFFWriteCustomDirectory(tif, &exifIFDOffset);\n \n", "prefixes": [ "libcamera-devel", "v3" ] }