Patch Detail
Show a patch.
GET /api/patches/9285/?format=api
{ "id": 9285, "url": "https://patchwork.libcamera.org/api/patches/9285/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9285/", "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": "<20200810164306.1472692-8-niklas.soderlund@ragnatech.se>", "date": "2020-08-10T16:43:06", "name": "[libcamera-devel,v2,7/7] qcam: dng_writer: Record camera model", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "869b83092c356fca32e0a95e6933e1bd02456a29", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9285/mbox/", "series": [ { "id": 1212, "url": "https://patchwork.libcamera.org/api/series/1212/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1212", "date": "2020-08-10T16:42:59", "name": "libcamera: Generate unique and stable camera names", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1212/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9285/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9285/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 00629BD87E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 10 Aug 2020 16:43:30 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C7EC3610B2;\n\tMon, 10 Aug 2020 18:43:29 +0200 (CEST)", "from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6E50561147\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 10 Aug 2020 18:43:25 +0200 (CEST)", "from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de\n\t[84.172.82.168]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 9bb5c299-db28-11ea-a39b-005056917f90;\n\tMon, 10 Aug 2020 18:43:24 +0200 (CEST)" ], "X-Halon-ID": "9bb5c299-db28-11ea-a39b-005056917f90", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 10 Aug 2020 18:43:06 +0200", "Message-Id": "<20200810164306.1472692-8-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20200810164306.1472692-1-niklas.soderlund@ragnatech.se>", "References": "<20200810164306.1472692-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 7/7] qcam: dng_writer: Record camera\n\tmodel", "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>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Record the model property of the camera if available.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/qcam/dng_writer.cpp | 13 ++++++++++---\n 1 file changed, 10 insertions(+), 3 deletions(-)", "diff": "diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp\nindex b5b81f0637b545af..3556dad16fd71b64 100644\n--- a/src/qcam/dng_writer.cpp\n+++ b/src/qcam/dng_writer.cpp\n@@ -15,6 +15,7 @@\n \n #include <libcamera/control_ids.h>\n #include <libcamera/formats.h>\n+#include <libcamera/property_ids.h>\n \n using namespace libcamera;\n \n@@ -352,6 +353,8 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \t\t const ControlList &metadata,\n \t\t const FrameBuffer *buffer, const void *data)\n {\n+\tconst ControlList &cameraProperties = camera->properties();\n+\n \tconst auto it = formatInfo.find(config.pixelFormat);\n \tif (it == formatInfo.cend()) {\n \t\tstd::cerr << \"Unsupported pixel format\" << std::endl;\n@@ -386,9 +389,13 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \tTIFFSetField(tif, TIFFTAG_DNGBACKWARDVERSION, version);\n \tTIFFSetField(tif, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB);\n \tTIFFSetField(tif, TIFFTAG_MAKE, \"libcamera\");\n-\t/* \\todo Report a real model string instead of id. */\n-\tTIFFSetField(tif, TIFFTAG_MODEL, camera->id().c_str());\n-\tTIFFSetField(tif, TIFFTAG_UNIQUECAMERAMODEL, camera->id().c_str());\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+\t\tTIFFSetField(tif, TIFFTAG_UNIQUECAMERAMODEL, model.c_str());\n+\t}\n+\n \tTIFFSetField(tif, TIFFTAG_SOFTWARE, \"qcam\");\n \tTIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);\n \n", "prefixes": [ "libcamera-devel", "v2", "7/7" ] }