diff options
| author | David Plowman <david.plowman@raspberrypi.com> | 2020-07-01 13:50:21 +0100 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-07-03 04:24:00 +0300 |
| commit | fd2b55cb3f2b50e273e01f422c251c18ffa441ef (patch) | |
| tree | bb654e7a74e731a62804e24ad36693203e4c6ed0 /src/ipa | |
| parent | 73b18967b6c04c2b6170d6f84685262b8c380cda (diff) | |
ipa: raspberrypi: Enable focus measure without recompile
Previously, output of the focus measure could not be enabled without
recompiling (because of the RPI_LOGGING_ENABLE macro). This uses the
libcamera logging mechanism instead, so can be enabled/disabled at
runtime.
Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/ipa')
| -rw-r--r-- | src/ipa/raspberrypi/controller/rpi/focus.cpp | 19 | ||||
| -rw-r--r-- | src/ipa/raspberrypi/controller/rpi/focus.hpp | 3 | ||||
| -rw-r--r-- | src/ipa/raspberrypi/data/imx477.json | 1 |
3 files changed, 9 insertions, 14 deletions
diff --git a/src/ipa/raspberrypi/controller/rpi/focus.cpp b/src/ipa/raspberrypi/controller/rpi/focus.cpp index 1e2b6491..ffe44362 100644 --- a/src/ipa/raspberrypi/controller/rpi/focus.cpp +++ b/src/ipa/raspberrypi/controller/rpi/focus.cpp @@ -6,11 +6,15 @@ */ #include <stdint.h> +#include "libcamera/internal/log.h" + #include "../focus_status.h" -#include "../logging.hpp" #include "focus.hpp" using namespace RPi; +using namespace libcamera; + +LOG_DEFINE_CATEGORY(RPiFocus) #define NAME "rpi.focus" @@ -24,11 +28,6 @@ char const *Focus::Name() const return NAME; } -void Focus::Read(boost::property_tree::ptree const ¶ms) -{ - print_ = params.get<int>("print", 0); -} - void Focus::Process(StatisticsPtr &stats, Metadata *image_metadata) { FocusStatus status; @@ -37,10 +36,10 @@ void Focus::Process(StatisticsPtr &stats, Metadata *image_metadata) status.focus_measures[i] = stats->focus_stats[i].contrast_val[1][1] / 1000; status.num = i; image_metadata->Set("focus.status", status); - if (print_) { - uint32_t value = (status.focus_measures[5] + status.focus_measures[6]) / 10; - RPI_LOG("Focus contrast measure: " << value); - } + + LOG(RPiFocus, Debug) + << "Focus contrast measure: " + << (status.focus_measures[5] + status.focus_measures[6]) / 10; } /* Register algorithm with the system. */ diff --git a/src/ipa/raspberrypi/controller/rpi/focus.hpp b/src/ipa/raspberrypi/controller/rpi/focus.hpp index d53401f7..a9756ea7 100644 --- a/src/ipa/raspberrypi/controller/rpi/focus.hpp +++ b/src/ipa/raspberrypi/controller/rpi/focus.hpp @@ -22,10 +22,7 @@ class Focus : public Algorithm public: Focus(Controller *controller); char const *Name() const override; - void Read(boost::property_tree::ptree const ¶ms) override; void Process(StatisticsPtr &stats, Metadata *image_metadata) override; -private: - bool print_; }; } /* namespace RPi */ diff --git a/src/ipa/raspberrypi/data/imx477.json b/src/ipa/raspberrypi/data/imx477.json index 389e8ce8..73ad1ae9 100644 --- a/src/ipa/raspberrypi/data/imx477.json +++ b/src/ipa/raspberrypi/data/imx477.json @@ -415,6 +415,5 @@ }, "rpi.focus": { - "print": 1 } } |