Patch Detail
Show a patch.
GET /api/1.1/patches/19690/?format=api
{ "id": 19690, "url": "https://patchwork.libcamera.org/api/1.1/patches/19690/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19690/", "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": "<20240313105645.120317-3-stefan.klug@ideasonboard.com>", "date": "2024-03-13T10:56:34", "name": "[02/12] libcamera: lc-compliance: Add TimeSheet class", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "fdcca25a92aa58f09de86f07bc1ea3b82b6e6b86", "submitter": { "id": 184, "url": "https://patchwork.libcamera.org/api/1.1/people/184/?format=api", "name": "Stefan Klug", "email": "stefan.klug@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/19690/mbox/", "series": [ { "id": 4219, "url": "https://patchwork.libcamera.org/api/1.1/series/4219/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4219", "date": "2024-03-13T10:56:32", "name": "Preparation for per-frame-controls and initial tests", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4219/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19690/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19690/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 9A9E1BD1F1\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 13 Mar 2024 10:57:03 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BB1F262C9A;\n\tWed, 13 Mar 2024 11:56:57 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E77EC62C80\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 13 Mar 2024 11:56:52 +0100 (CET)", "from jasper.fritz.box (unknown\n\t[IPv6:2a00:6020:448c:6c00:9b07:31b5:38e1:e957])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7CF87F8B;\n\tWed, 13 Mar 2024 11:56:30 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"idtXUAoM\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1710327390;\n\tbh=ej1uK+sfbRUZYyaaAKX1MFmV6CMLr92Fr0BTKMd+7bY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=idtXUAoMO3+XFusyH1ZqBvntYw87gz0H7ODmnewcCwZio7EseFbr4GxYYOq7Q8WAM\n\tFGoIDcWkVyHVxRXciVSvOUzkfue/yQvsI0lEoW7RKtu9rI8nEZTTpDzWSTazv2XPDE\n\tGxJlKb05vZrekQiAOFk/W/48yo8d5X34OvIKHEJ4=", "From": "Stefan Klug <stefan.klug@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[PATCH 02/12] libcamera: lc-compliance: Add TimeSheet class", "Date": "Wed, 13 Mar 2024 11:56:34 +0100", "Message-Id": "<20240313105645.120317-3-stefan.klug@ideasonboard.com>", "X-Mailer": "git-send-email 2.40.1", "In-Reply-To": "<20240313105645.120317-1-stefan.klug@ideasonboard.com>", "References": "<20240313105645.120317-1-stefan.klug@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This class allows us to prepare a time sheet with controls for the frames\nto capture (a bit like the capture script in cam).\n\nDuring capture the metadata is recorded. Additionally a mean brightness\nvalue of a 20x20 pixel spot in the middle of the frame is calculated.\n\nThis allows easy analysis after running the capture without complicated state\nhandling due to the asynchronous nature of the capturing process.\n\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n---\n src/apps/lc-compliance/meson.build | 1 +\n src/apps/lc-compliance/time_sheet.cpp | 145 ++++++++++++++++++++++++++\n src/apps/lc-compliance/time_sheet.h | 55 ++++++++++\n 3 files changed, 201 insertions(+)\n create mode 100644 src/apps/lc-compliance/time_sheet.cpp\n create mode 100644 src/apps/lc-compliance/time_sheet.h", "diff": "diff --git a/src/apps/lc-compliance/meson.build b/src/apps/lc-compliance/meson.build\nindex c792f072..eb7b2d71 100644\n--- a/src/apps/lc-compliance/meson.build\n+++ b/src/apps/lc-compliance/meson.build\n@@ -16,6 +16,7 @@ lc_compliance_sources = files([\n 'environment.cpp',\n 'main.cpp',\n 'simple_capture.cpp',\n+ 'time_sheet.cpp',\n ])\n \n lc_compliance = executable('lc-compliance', lc_compliance_sources,\ndiff --git a/src/apps/lc-compliance/time_sheet.cpp b/src/apps/lc-compliance/time_sheet.cpp\nnew file mode 100644\nindex 00000000..0ac544d6\n--- /dev/null\n+++ b/src/apps/lc-compliance/time_sheet.cpp\n@@ -0,0 +1,145 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024, Ideas on Board Oy\n+ *\n+ * time_sheet.cpp\n+ */\n+\n+#include \"time_sheet.h\"\n+\n+#include <sstream>\n+#include <libcamera/libcamera.h>\n+\n+#include \"libcamera/internal/formats.h\"\n+#include \"libcamera/internal/mapped_framebuffer.h\"\n+\n+using namespace libcamera;\n+\n+double calcPixelMeanNV12(const uint8_t *data)\n+{\n+\treturn (double)*data;\n+}\n+\n+double calcPixelMeanRAW10(const uint8_t *data)\n+{\n+\treturn (double)*((const uint16_t *)data);\n+}\n+\n+double calculateMeanBrightnessFromCenterSpot(libcamera::Request *request)\n+{\n+\tconst Request::BufferMap &buffers = request->buffers();\n+\tfor (const auto &[stream, buffer] : buffers) {\n+\t\tMappedFrameBuffer in(buffer, MappedFrameBuffer::MapFlag::Read);\n+\t\tif (in.isValid()) {\n+\t\t\tauto data = in.planes()[0].data();\n+\t\t\tauto streamConfig = stream->configuration();\n+\t\t\tauto formatInfo = PixelFormatInfo::info(streamConfig.pixelFormat);\n+\n+\t\t\tstd::function<double(const uint8_t *data)> calcPixelMean;\n+\t\t\tint pixelStride;\n+\n+\t\t\tswitch (streamConfig.pixelFormat) {\n+\t\t\tcase formats::NV12:\n+\t\t\t\tcalcPixelMean = calcPixelMeanNV12;\n+\t\t\t\tpixelStride = 1;\n+\t\t\t\tbreak;\n+\t\t\tcase formats::SRGGB10:\n+\t\t\t\tcalcPixelMean = calcPixelMeanRAW10;\n+\t\t\t\tpixelStride = 2;\n+\t\t\t\tbreak;\n+\t\t\tdefault:\n+\t\t\t\tstd::stringstream s;\n+\t\t\t\ts << \"Unsupported Pixelformat \" << formatInfo.name;\n+\t\t\t\tthrow std::invalid_argument(s.str());\n+\t\t\t}\n+\n+\t\t\tdouble sum = 0;\n+\t\t\tint w = 20;\n+\t\t\tint xs = streamConfig.size.width / 2 - w / 2;\n+\t\t\tint ys = streamConfig.size.height / 2 - w / 2;\n+\n+\t\t\tfor (auto y = ys; y < ys + w; y++) {\n+\t\t\t\tauto line = data + y * streamConfig.stride;\n+\t\t\t\tfor (auto x = xs; x < xs + w; x++) {\n+\t\t\t\t\tsum += calcPixelMean(line + x * pixelStride);\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tsum = sum / (w * w);\n+\t\t\treturn sum;\n+\t\t}\n+\t}\n+\treturn 0;\n+}\n+\n+TimeSheetEntry::TimeSheetEntry(const ControlIdMap &idmap)\n+\t: controls_(idmap)\n+{\n+}\n+\n+void TimeSheetEntry::handleCompleteRequest(libcamera::Request *request, const TimeSheetEntry *previous)\n+{\n+\tmetadata_ = request->metadata();\n+\n+\tspotBrightness_ = calculateMeanBrightnessFromCenterSpot(request);\n+\tif (previous) {\n+\t\tbrightnessChange_ = spotBrightness_ / previous->getSpotBrightness();\n+\t}\n+\tsequence_ = request->sequence();\n+}\n+\n+void TimeSheetEntry::printInfo()\n+{\n+\tstd::cout << \"=== Frame \" << sequence_ << std::endl;\n+\tif (!controls_.empty()) {\n+\t\tstd::cout << \"Controls:\" << std::endl;\n+\t\tauto idMap = controls_.idMap();\n+\t\tassert(idMap);\n+\t\tfor (const auto &[id, value] : controls_) {\n+\t\t\tstd::cout << \" \" << idMap->at(id)->name() << \" : \" << value.toString() << std::endl;\n+\t\t}\n+\t}\n+\n+\tif (!metadata_.empty()) {\n+\t\tstd::cout << \"Metadata:\" << std::endl;\n+\t\tauto idMap = metadata_.idMap();\n+\t\tassert(idMap);\n+\t\tfor (const auto &[id, value] : metadata_) {\n+\t\t\tstd::cout << \" \" << idMap->at(id)->name() << \" : \" << value.toString() << std::endl;\n+\t\t}\n+\t}\n+\n+\tstd::cout << \"Calculated Brightness: \" << spotBrightness_ << std::endl;\n+}\n+\n+TimeSheetEntry &TimeSheet::get(size_t pos)\n+{\n+\tauto &entry = entries_[pos];\n+\tif (!entry)\n+\t\tentry = std::make_shared<TimeSheetEntry>(idmap_);\n+\treturn *entry;\n+}\n+\n+void TimeSheet::prepareForQueue(libcamera::Request *request, uint32_t sequence)\n+{\n+\trequest->controls() = get(sequence).controls();\n+}\n+\n+void TimeSheet::handleCompleteRequest(libcamera::Request *request)\n+{\n+\tuint32_t sequence = request->sequence();\n+\tauto &entry = get(sequence);\n+\tTimeSheetEntry *previous = nullptr;\n+\tif (sequence >= 1) {\n+\t\tprevious = entries_[sequence - 1].get();\n+\t}\n+\n+\tentry.handleCompleteRequest(request, previous);\n+}\n+\n+void TimeSheet::printAllInfos()\n+{\n+\tfor (auto entry : entries_) {\n+\t\tif (entry)\n+\t\t\tentry->printInfo();\n+\t}\n+}\ndiff --git a/src/apps/lc-compliance/time_sheet.h b/src/apps/lc-compliance/time_sheet.h\nnew file mode 100644\nindex 00000000..2bb89ab3\n--- /dev/null\n+++ b/src/apps/lc-compliance/time_sheet.h\n@@ -0,0 +1,55 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024, Ideas on Board Oy\n+ *\n+ * time_sheet.h\n+ */\n+\n+#pragma once\n+\n+#include <future>\n+#include <vector>\n+\n+#include <libcamera/libcamera.h>\n+\n+class TimeSheetEntry\n+{\n+public:\n+\tTimeSheetEntry() = delete;\n+\tTimeSheetEntry(const libcamera::ControlIdMap &idmap);\n+\tTimeSheetEntry(TimeSheetEntry &&other) noexcept = default;\n+\tTimeSheetEntry(const TimeSheetEntry &) = delete;\n+\n+\tlibcamera::ControlList &controls() { return controls_; };\n+\tlibcamera::ControlList &metadata() { return metadata_; };\n+\tvoid handleCompleteRequest(libcamera::Request *request, const TimeSheetEntry *previous);\n+\tvoid printInfo();\n+\tdouble getSpotBrightness() const { return spotBrightness_; };\n+\tdouble getBrightnessChange() const { return brightnessChange_; };\n+\n+private:\n+\tdouble spotBrightness_ = 0.0;\n+\tdouble brightnessChange_ = 0.0;\n+\tlibcamera::ControlList controls_;\n+\tlibcamera::ControlList metadata_;\n+\tuint32_t sequence_ = 0;\n+};\n+\n+class TimeSheet\n+{\n+public:\n+\tTimeSheet(int count, const libcamera::ControlIdMap &idmap)\n+\t\t: idmap_(idmap), entries_(count){};\n+\n+\tvoid prepareForQueue(libcamera::Request *request, uint32_t sequence);\n+\tvoid handleCompleteRequest(libcamera::Request *request);\n+\tvoid printAllInfos();\n+\n+\tTimeSheetEntry &operator[](size_t pos) { return get(pos); };\n+\tTimeSheetEntry &get(size_t pos);\n+\tsize_t size() const { return entries_.size(); };\n+\n+private:\n+\tconst libcamera::ControlIdMap &idmap_;\n+\tstd::vector<std::shared_ptr<TimeSheetEntry>> entries_;\n+};\n", "prefixes": [ "02/12" ] }