{"id":19742,"url":"https://patchwork.libcamera.org/api/patches/19742/?format=json","web_url":"https://patchwork.libcamera.org/patch/19742/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20240319120517.362082-3-stefan.klug@ideasonboard.com>","date":"2024-03-19T12:05:03","name":"[v3,02/16] libcamera: lc-compliance: Add TimeSheet class","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"dc1733b66ebb0367ac2a8f22cd7d8a7241643f54","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19742/mbox/","series":[{"id":4230,"url":"https://patchwork.libcamera.org/api/series/4230/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4230","date":"2024-03-19T12:05:01","name":"Preparation for per-frame-controls and initial tests","version":3,"mbox":"https://patchwork.libcamera.org/series/4230/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19742/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19742/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 7BA72C3274\n\tfor ;\n\tTue, 19 Mar 2024 12:05:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 50F1862D35;\n\tTue, 19 Mar 2024 13:05:31 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E399362CA7\n\tfor ;\n\tTue, 19 Mar 2024 13:05:27 +0100 (CET)","from jasper.fritz.box (unknown\n\t[IPv6:2a00:6020:448c:6c00:1478:344b:8fcb:baf5])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3201716F9;\n\tTue, 19 Mar 2024 13:05:01 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"OzjbpHBf\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1710849901;\n\tbh=sum0LNiyBWcI02Cm1czo0s5fVuD5BqSZAwIRpFzcYm8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=OzjbpHBfB1TDaV0FOBeuw1qT8thNb25Mrs8D8Cr++mnEX743epAs/TWMY5Cn7Zy9d\n\tUl+RR4oidHlN7Bd03dSOlyNnEHLgcms9hP/voOwjXVqwWaL6yhJ3pDiFMrfu6IIBnl\n\tFSh2LCdDEJDQsQO4x4Arp7nOZAltGFV1H1AHnDWc=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[PATCH v3 02/16] libcamera: lc-compliance: Add TimeSheet class","Date":"Tue, 19 Mar 2024 13:05:03 +0100","Message-Id":"<20240319120517.362082-3-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.40.1","In-Reply-To":"<20240319120517.362082-1-stefan.klug@ideasonboard.com>","References":"<20240319120517.362082-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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"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 \n---\n src/apps/lc-compliance/meson.build | 1 +\n src/apps/lc-compliance/time_sheet.cpp | 148 ++++++++++++++++++++++++++\n src/apps/lc-compliance/time_sheet.h | 62 +++++++++++\n 3 files changed, 211 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..8048cf30\n--- /dev/null\n+++ b/src/apps/lc-compliance/time_sheet.cpp\n@@ -0,0 +1,148 @@\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 \n+#include \n+\n+#include \"libcamera/internal/formats.h\"\n+#include \"libcamera/internal/mapped_framebuffer.h\"\n+\n+using namespace libcamera;\n+\n+namespace {\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\tcontinue;\n+\n+\t\tconst uint8_t *data = in.planes()[0].data();\n+\t\tconst auto &streamConfig = stream->configuration();\n+\t\tconst auto &formatInfo = PixelFormatInfo::info(streamConfig.pixelFormat);\n+\t\tdouble (*calcPixelMean)(const uint8_t *);\n+\t\tint pixelStride;\n+\n+\t\tswitch (streamConfig.pixelFormat) {\n+\t\tcase formats::NV12:\n+\t\t\tcalcPixelMean = [](const uint8_t *d) -> double {\n+\t\t\t\treturn static_cast(*d);\n+\t\t\t};\n+\t\t\tpixelStride = 1;\n+\t\t\tbreak;\n+\t\tcase formats::SRGGB10:\n+\t\t\tcalcPixelMean = [](const uint8_t *d) -> double {\n+\t\t\t\treturn static_cast(*reinterpret_cast(d));\n+\t\t\t};\n+\t\t\tpixelStride = 2;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tstd::stringstream s;\n+\t\t\ts << \"Unsupported Pixelformat \" << formatInfo.name;\n+\t\t\tthrow std::invalid_argument(s.str());\n+\t\t}\n+\n+\t\tdouble sum = 0;\n+\t\tint w = 20;\n+\t\tint xs = streamConfig.size.width / 2 - w / 2;\n+\t\tint ys = streamConfig.size.height / 2 - w / 2;\n+\n+\t\tfor (auto y = ys; y < ys + w; y++) {\n+\t\t\tauto line = data + y * streamConfig.stride;\n+\t\t\tfor (auto x = xs; x < xs + w; x++)\n+\t\t\t\tsum += calcPixelMean(line + x * pixelStride);\n+\t\t}\n+\t\tsum = sum / (w * w);\n+\t\treturn sum;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+} /* namespace */\n+\n+TimeSheetEntry::TimeSheetEntry(const ControlIdMap &idmap)\n+\t: controls_(idmap)\n+{\n+}\n+\n+void TimeSheetEntry::handleCompleteRequest(libcamera::Request *request,\n+\t\t\t\t\t const TimeSheetEntry *previous)\n+{\n+\tmetadata_ = request->metadata();\n+\n+\tspotBrightness_ = calculateMeanBrightnessFromCenterSpot(request);\n+\tif (previous)\n+\t\tbrightnessChange_ = spotBrightness_ / previous->spotBrightness();\n+\n+\tsequence_ = request->sequence();\n+}\n+\n+std::ostream &operator<<(std::ostream &os, const TimeSheetEntry &te)\n+{\n+\tos << \"=== Frame \" << te.sequence_ << std::endl;\n+\tif (!te.controls_.empty()) {\n+\t\tos << \"Controls:\" << std::endl;\n+\t\tconst auto &idMap = te.controls_.idMap();\n+\t\tassert(idMap);\n+\t\tfor (const auto &[id, value] : te.controls_)\n+\t\t\tos << \" \" << idMap->at(id)->name() << \" : \"\n+\t\t\t << value.toString() << std::endl;\n+\t}\n+\n+\tif (!te.metadata_.empty()) {\n+\t\tos << \"Metadata:\" << std::endl;\n+\t\tconst auto &idMap = te.metadata_.idMap();\n+\t\tassert(idMap);\n+\t\tfor (const auto &[id, value] : te.metadata_)\n+\t\t\tos << \" \" << idMap->at(id)->name() << \" : \"\n+\t\t\t << value.toString() << std::endl;\n+\t}\n+\n+\tos << \"Calculated Brightness: \" << te.spotBrightness() << std::endl;\n+\treturn os;\n+}\n+\n+TimeSheetEntry &TimeSheet::get(size_t pos)\n+{\n+\tentries_.reserve(pos + 1);\n+\tauto &entry = entries_[pos];\n+\tif (!entry)\n+\t\tentry = std::make_unique(idmap_);\n+\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+\n+\tentry.handleCompleteRequest(request, previous);\n+}\n+\n+std::ostream &operator<<(std::ostream &os, const TimeSheet &ts)\n+{\n+\tfor (const auto &entry : ts.entries_) {\n+\t\tif (entry)\n+\t\t\tos << *entry;\n+\t}\n+\n+\treturn os;\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..417277aa\n--- /dev/null\n+++ b/src/apps/lc-compliance/time_sheet.h\n@@ -0,0 +1,62 @@\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 \n+#include \n+#include \n+\n+#include \n+\n+class TimeSheetEntry\n+{\n+public:\n+\tTimeSheetEntry() = delete;\n+\tTimeSheetEntry(const libcamera::ControlIdMap &idmap);\n+\tTimeSheetEntry(TimeSheetEntry &&other) = default;\n+\tTimeSheetEntry(const TimeSheetEntry &) = delete;\n+\t~TimeSheetEntry() = default;\n+\n+\tlibcamera::ControlList &controls() { return controls_; }\n+\tconst libcamera::ControlList &metadata() const { return metadata_; }\n+\tvoid handleCompleteRequest(libcamera::Request *request,\n+\t\t\t\t const TimeSheetEntry *previous);\n+\tdouble spotBrightness() const { return spotBrightness_; }\n+\tdouble brightnessChange() const { return brightnessChange_; }\n+\n+\tfriend std::ostream &operator<<(std::ostream &os, const TimeSheetEntry &te);\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+\t{\n+\t}\n+\n+\tvoid prepareForQueue(libcamera::Request *request, uint32_t sequence);\n+\tvoid handleCompleteRequest(libcamera::Request *request);\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+\tfriend std::ostream &operator<<(std::ostream &os, const TimeSheet &ts);\n+\n+private:\n+\tconst libcamera::ControlIdMap &idmap_;\n+\tstd::vector> entries_;\n+};\n","prefixes":["v3","02/16"]}