Patch Detail
Show a patch.
GET /api/1.1/patches/15656/?format=api
{ "id": 15656, "url": "https://patchwork.libcamera.org/api/1.1/patches/15656/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15656/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20220408014231.231083-5-Rauch.Christian@gmx.de>", "date": "2022-04-08T01:42:31", "name": "[libcamera-devel,v3,4/4] use std::optional to handle invalid control values", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "5040b172937e8507c952bc7775a13ac8f88a8396", "submitter": { "id": 111, "url": "https://patchwork.libcamera.org/api/1.1/people/111/?format=api", "name": "Christian Rauch", "email": "Rauch.Christian@gmx.de" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/15656/mbox/", "series": [ { "id": 3045, "url": "https://patchwork.libcamera.org/api/1.1/series/3045/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3045", "date": "2022-04-08T01:42:28", "name": "generate and use fixed-sized Span Control types", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3045/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15656/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15656/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 606FDC326D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 8 Apr 2022 01:42:42 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B4C0D65644;\n\tFri, 8 Apr 2022 03:42:39 +0200 (CEST)", "from mout.gmx.net (mout.gmx.net [212.227.17.21])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 46F7665642\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 8 Apr 2022 03:42:36 +0200 (CEST)", "from localhost.localdomain ([92.10.251.63]) by mail.gmx.net\n\t(mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id\n\t1M59C8-1nbXiR3DzY-0018bX; Fri, 08 Apr 2022 03:42:35 +0200" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1649382159;\n\tbh=HBsoBIb7NuzDxeK3IuRL0qDvHy/MXk/GFJTpqX85nfo=;\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=FHaOr4RXoeOJT/MVbcKpZgL1AMOFJkkM2R7ImDwI94GhO9Y/jiwcyMeh8c7GwKJUt\n\tEkSJcEqDFFyBHYQ9ncfAjCUigG5GhkZObl/p02fRSABCSzFYV83loRf4VMXYgl2GXn\n\tUg0kVcZNRr9OTS7/k6deuireAolw+8HCLlvsGKe3F02OL+OR9M3RBqj5qkR5VjtgJ1\n\t0FdYNk6MnngF7BXydpzuyy8yxch6mj0HLEeVwjlmU1+6dcowb/Z9hSCAuLtBCQPiNx\n\t2MfcK6Rd56JnS92fu5Bc1TzMpSGCDPBjiRYUZi5l7vc9f8SFWBvMC0wVM85rE9sYzI\n\tgktD3rC/hAPBw==", "v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;\n\ts=badeba3b8450; t=1649382155;\n\tbh=HBsoBIb7NuzDxeK3IuRL0qDvHy/MXk/GFJTpqX85nfo=;\n\th=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;\n\tb=N35z1BurlDgcyMauEKI879zD0pHa5FI9XIRk7d6A/sKQiaFNW/JlH/NlMAY9FJ51V\n\tCrklhCBzS1YNGrZ8odAPOv642J9jjO8yPBJZ4Pavo1KyGwsMW2ZSsJKMZVu+mktD5+\n\tgpr5fdYsoPONqpyj98PcEOH7V/NM3dv0DmA6Ebew=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=gmx.net header.i=@gmx.net\n\theader.b=\"N35z1Bur\"; dkim-atps=neutral", "X-UI-Sender-Class": "01bb95c1-4bf8-414a-932a-4f6e2808ef9c", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 8 Apr 2022 02:42:31 +0100", "Message-Id": "<20220408014231.231083-5-Rauch.Christian@gmx.de>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220408014231.231083-1-Rauch.Christian@gmx.de>", "References": "<20220408014231.231083-1-Rauch.Christian@gmx.de>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "quoted-printable", "X-Provags-ID": "V03:K1:p3nB75K/LtNqP2MbQdhvfWtz7eLMW/6SqSZiCmKqDlyVTwYruM6\n\twlosaC7rJEmmCJNwBYEhLtXhnhKcN11nKEmw145YBm/R7Aba+k98qC5HFWOuqKX6c3xlqYf\n\tHrMvNeadUpz1N0XzWynbf0Y/pedFHxrODvGWxmWTOI9bSWJJl4FPqOGfxHyCjWcmQ0+niZO\n\tnvnvP3tDH3dQbZ5yskJyA==", "X-Spam-Flag": "NO", "X-UI-Out-Filterresults": "notjunk:1; V03:K0:UwoQ1vf1zLg=:UMSqmFP0wz4qwVG9rC687J\n\tpBUH+ukTuQhqsH+BS3JKN2916mfXihL9L3KSX/R9AopU6N+hyAIPHTFTO6lDqWGEUDj2+i1OC\n\tW6OMSm3KAYaQ9LcjSmHVlcSa4vL4VZK8/b1zNqU0zzQbW4XzaqdGyqG0UOI5jxA7CBpE2KCZt\n\t24wD1xq3TfVozp9YgCWr30+tApxiMiQ8b/gGi0qH3WwxCDddXziF2WniEkZkHzjznVX++BO4v\n\tBu26EZ9YUfDXSSb2SgrOuaLBeonagJcCS4QEPFDgY4nuLNmp05r0qiFBXlZvcW9xoU/ylzEla\n\tMD++onBpg+f3EDzDesVJK0oL3nHcgJWGKDUikSz4dg3ABdCVwz/Sd5yWUDowq1Tjknv+HHa74\n\tJsOvTDqsuim7ReKkmYmLThJAcVzxnWv+Bb6/XWeI436AUYrl0R5PTokCVtnMDcA94lFmy1Krj\n\tQUxyjBAX3OP5y/lLMLlnQuaDgy7O7/dSmeP1k1rhQjyUbkLqkCaO+wcG6ZJ9+S1rhqBxyVUgV\n\tR3P5JaNCda5/4ezVqCo8Fh9lwDZo4MTMF6WUG4WsxZCshzmZ5Nng1KzlXyzj89O7qf2dcZGv7\n\tpkV5SupwWcrRpCc8ExrBmVDtqLo6pv1cJern37fxde2y7PBRts7vsjG++J0o49fz3+02M9Ao9\n\tFJJHXmuV6baLVEbKtU5D+Z7wndYpl8T9kXtfeLbsIKAQqg8unqpNs2LQZ5PpSJOLtGzhkuAQT\n\taYCRPsIZZkkytIdvO/Wc9Du39ZUbEq2+NDZSspWopWBHWYyez6Nx/ZJ7SYTepbz4wsIxnUK8G\n\tJSPM1vS9HfLXKGN/u6mHgJFK+5resKwtKG4TdLA3B5PFFV4MVAu95MTD5ruNpZDrUknR/9x6T\n\tCZE9XAskHoOJbbnQOqpMNPM7oKBGFhmzRgAun79ROmjuqY0VOZkT1B7/11pl5rZi4C6DuwjgO\n\torCXjiwsI6UAJTokLcQCtKZWndPqIpe7mBja/YzC7Ruwbed2HOx9S9I/aPpIK3Clk3yFbrdRw\n\tjQ0jdagPgvszWwxCtoJEWC+Y2VJunRbK/OyPCGkKe/in08F8mzLjrEH2UtK9xe7aUP2lVelAL\n\tQQdVeYyqR3mLnk=", "Subject": "[libcamera-devel] [PATCH v3 4/4] use std::optional to handle\n\tinvalid 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>\n---\n include/libcamera/controls.h | 6 +++---\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 | 15 +++++++++------\n 6 files changed, 24 insertions(+), 21 deletions(-)\n\n--\n2.25.1", "diff": "diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex 665bcac1..57b777e9 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -167,7 +167,7 @@ public:\n\n \t\tusing V = typename T::value_type;\n \t\tconst V *value = reinterpret_cast<const V *>(data().data());\n-\t\treturn { value, numElements_ };\n+\t\treturn T{ value, numElements_ };\n \t}\n\n #ifndef __DOXYGEN__\n@@ -373,11 +373,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/cam/main.cpp b/src/cam/main.cpp\nindex c7f664b9..853a78ed 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -293,7 +293,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).value_or(int32_t{})) {\n \t\tcase properties::CameraLocationFront:\n \t\t\taddModel = false;\n \t\t\tname = \"Internal front camera \";\n@@ -313,7 +313,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).value_or(std::string{}) + \"' \";\n \t}\n\n \tname += \"(\" + camera->id() + \")\";\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 5a5cdf66..93b32e94 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -934,7 +934,7 @@ void IPARPi::returnEmbeddedBuffer(unsigned int bufferId)\n\n void IPARPi::prepareISP(const ipa::RPi::ISPConfig &data)\n {\n-\tint64_t frameTimestamp = data.controls.get(controls::SensorTimestamp);\n+\tint64_t frameTimestamp = data.controls.get(controls::SensorTimestamp).value_or(int64_t{});\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 60e01917..394221cb 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -1146,7 +1146,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).value_or(int32_t{});\n \t\telse\n \t\t\tLOG(IPU3, Warning) << \"Rotation control not exposed by \"\n \t\t\t\t\t << cio2->sensor()->id()\n@@ -1341,7 +1341,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).value_or(Rectangle{});\n \trequest->metadata().set(controls::ScalerCrop, cropRegion_);\n\n \tif (frameInfos_.tryComplete(info))\n@@ -1442,7 +1442,7 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n \tev.op = ipa::ipu3::EventStatReady;\n \tev.frame = info->id;\n \tev.bufferId = info->statBuffer->cookie();\n-\tev.frameTimestamp = request->metadata().get(controls::SensorTimestamp);\n+\tev.frameTimestamp = request->metadata().get(controls::SensorTimestamp).value_or(int64_t{});\n \tev.sensorControls = info->effectiveSensorControls;\n \tipa_->processEvent(ev);\n }\n@@ -1477,8 +1477,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).value_or(int32_t{});\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 0fa294d4..63d57033 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(int32_t{});\n \tbool success;\n \tTransform rotationTransform = transformFromRotation(rotation, &success);\n \tif (!success)\n@@ -1696,7 +1696,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, 2> colourGains = controls.get(libcamera::controls::ColourGains);\n+\t\tlibcamera::Span<const float, 2> colourGains =\n+\t\t\tcontrols.get(libcamera::controls::ColourGains).value_or(libcamera::Span<const float, 2>({ 0, 0 }));\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@@ -2031,7 +2032,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).value_or(Rectangle{});\n\n \t\tif (!nativeCrop.width || !nativeCrop.height)\n \t\t\tnativeCrop = { 0, 0, 1, 1 };\n@@ -2069,7 +2070,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(int64_t{}));\n\n \trequest->metadata().set(controls::ScalerCrop, scalerCrop_);\n }\ndiff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp\nindex 2fb527d8..030432e3 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).value_or(std::string{});\n \t\tTIFFSetField(tif, TIFFTAG_MODEL, model.c_str());\n \t\t/* \\todo set TIFFTAG_UNIQUECAMERAMODEL. */\n \t}\n@@ -438,7 +438,8 @@ 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, 2> const &colourGains = metadata.get(controls::ColourGains);\n+\t\tSpan<const float, 2> const &colourGains =\n+\t\t\tmetadata.get(controls::ColourGains).value_or(libcamera::Span<const float, 2>({ 0, 0 }));\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@@ -446,7 +447,8 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \t\t}\n \t}\n \tif (metadata.contains(controls::ColourCorrectionMatrix)) {\n-\t\tSpan<const float, 9> const &coeffs = metadata.get(controls::ColourCorrectionMatrix);\n+\t\tSpan<const float, 9> const &coeffs =\n+\t\t\tmetadata.get(controls::ColourCorrectionMatrix).value_or(Span<const float, 9>({ 0, 0, 0, 0, 0, 0, 0, 0, 0 }));\n \t\tMatrix3d ccmSupplied(coeffs);\n \t\tif (ccmSupplied.determinant() > eps)\n \t\t\tccm = ccmSupplied;\n@@ -515,7 +517,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, 4> levels = metadata.get(controls::SensorBlackLevels);\n+\t\tSpan<const int32_t, 4> levels =\n+\t\t\tmetadata.get(controls::SensorBlackLevels).value_or(Span<const int32_t, 4>({ 0, 0, 0, 0 }));\n\n \t\t/*\n \t\t * The black levels control is specified in R, Gr, Gb, B order.\n@@ -593,13 +596,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).value_or(float{});\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).value_or(float{}) / 1e6;\n \t\tTIFFSetField(tif, EXIFTAG_EXPOSURETIME, exposureTime);\n \t}\n\n", "prefixes": [ "libcamera-devel", "v3", "4/4" ] }