Add cv::Mat API for Detectors

Author: Nuzhny007

src/Detector/BaseDetector.cpp

@@ -19,7 +19,7 @@
 ///
 std::unique_ptr<BaseDetector> BaseDetector::CreateDetector(tracking::Detectors detectorType,
                                                            const config_t& config,
-                                                           cv::UMat& frame)
+                                                           const cv::UMat& frame)
 {
     std::unique_ptr<BaseDetector> detector;
 
@@ -92,3 +92,15 @@ std::unique_ptr<BaseDetector> BaseDetector::CreateDetector(tracking::Detectors d
         detector.reset();
     return std::move(detector);
 }
+
+///
+std::unique_ptr<BaseDetector> BaseDetector::CreateDetectorKV(tracking::Detectors detectorType, const KeyVal& config, const cv::Mat& gray)
+{
+    config_t mconfig;
+    for (auto kv : config.m_config)
+    {
+        mconfig.emplace(kv.first, kv.second);
+    }
+    cv::UMat uframe = gray.getUMat(cv::ACCESS_READ);
+    return CreateDetector(detectorType, mconfig, uframe);
+}

src/Detector/BaseDetector.h

@@ -3,6 +3,20 @@
 #include <memory>
 #include "defines.h"
 
+///
+/// \brief The BaseDetector class
+///
+struct KeyVal
+{
+    KeyVal() = default;
+    void Add(const std::string& key, const std::string& val)
+    {
+        m_config.emplace_back(key, val);
+    }
+
+    std::vector<std::pair<std::string, std::string>> m_config;
+};
+
 ///
 /// \brief The BaseDetector class
 ///
@@ -19,6 +33,15 @@ class BaseDetector
         m_minObjectSize.height = m_minObjectSize.width;
     }
     ///
+    /// \brief BaseDetector
+    /// \param frame
+    ///
+    BaseDetector(const cv::Mat& frame)
+    {
+        m_minObjectSize.width = std::max(5, frame.cols / 100);
+        m_minObjectSize.height = m_minObjectSize.width;
+    }
+    ///
     /// \brief ~BaseDetector
     ///
     virtual ~BaseDetector(void) = default;
@@ -172,7 +195,8 @@ class BaseDetector
     }
 
     ///
-    static std::unique_ptr<BaseDetector> CreateDetector(tracking::Detectors detectorType, const config_t& config, cv::UMat& gray);
+    static std::unique_ptr<BaseDetector> CreateDetector(tracking::Detectors detectorType, const config_t& config, const cv::UMat& gray);
+    static std::unique_ptr<BaseDetector> CreateDetectorKV(tracking::Detectors detectorType, const KeyVal& config, const cv::Mat& gray);
 
 
 protected:

src/Detector/FaceDetector.cpp

@@ -9,6 +9,15 @@ FaceDetector::FaceDetector(const cv::UMat& gray)
 {
 }
 
+///
+/// \brief FaceDetector::FaceDetector
+/// \param gray
+///
+FaceDetector::FaceDetector(const cv::Mat& gray)
+    : BaseDetector(gray)
+{
+}
+
 ///
 /// \brief FaceDetector::Init
 /// \param cascadeFileName

src/Detector/FaceDetector.h

@@ -9,6 +9,7 @@ class FaceDetector final : public BaseDetector
 {
 public:
     FaceDetector(const cv::UMat& gray);
+    FaceDetector(const cv::Mat& gray);
     ~FaceDetector(void) = default;
 
     bool Init(const config_t& config) override;

src/Detector/MotionDetector.cpp

@@ -5,14 +5,22 @@
 /// \param algType
 /// \param gray
 ///
-MotionDetector::MotionDetector(
-	BackgroundSubtract::BGFG_ALGS algType,
-    cv::UMat& gray)
-    :
-      BaseDetector(gray),
-      m_algType(algType)
+MotionDetector::MotionDetector(BackgroundSubtract::BGFG_ALGS algType, const cv::UMat& gray)
+    : BaseDetector(gray), m_algType(algType)
 {
-	m_fg = gray.clone();
+	m_fg.create(gray.size(), CV_8UC1);
+	m_backgroundSubst = std::make_unique<BackgroundSubtract>(algType, gray.channels());
+}
+
+///
+/// \brief MotionDetector::MotionDetector
+/// \param algType
+/// \param gray
+///
+MotionDetector::MotionDetector(BackgroundSubtract::BGFG_ALGS algType, const cv::Mat& gray)
+    : BaseDetector(gray), m_algType(algType)
+{
+	m_fg.create(gray.size(), CV_8UC1);
 	m_backgroundSubst = std::make_unique<BackgroundSubtract>(algType, gray.channels());
 }
 

src/Detector/MotionDetector.h

@@ -9,7 +9,8 @@
 class MotionDetector : public BaseDetector
 {
 public:
-    MotionDetector(BackgroundSubtract::BGFG_ALGS algType, cv::UMat& gray);
+    MotionDetector(BackgroundSubtract::BGFG_ALGS algType, const cv::UMat& gray);
+    MotionDetector(BackgroundSubtract::BGFG_ALGS algType, const cv::Mat& gray);
     ~MotionDetector(void) = default;
 
     bool Init(const config_t& config) override;

src/Detector/OCVDNNDetector.cpp

@@ -4,7 +4,7 @@
 
 ///
 /// \brief OCVDNNDetector::OCVDNNDetector
-/// \param gray
+/// \param colorFrame
 ///
 OCVDNNDetector::OCVDNNDetector(const cv::UMat& colorFrame)
     : BaseDetector(colorFrame)
@@ -18,6 +18,22 @@ OCVDNNDetector::OCVDNNDetector(const cv::UMat& colorFrame)
                      "sheep", "sofa", "train", "tvmonitor" };
 }
 
+///
+/// \brief OCVDNNDetector::OCVDNNDetector
+/// \param colorFrame
+///
+OCVDNNDetector::OCVDNNDetector(const cv::Mat& colorFrame)
+    : BaseDetector(colorFrame)
+
+{
+    m_classNames = { "background",
+                     "aeroplane", "bicycle", "bird", "boat",
+                     "bottle", "bus", "car", "cat", "chair",
+                     "cow", "diningtable", "dog", "horse",
+                     "motorbike", "person", "pottedplant",
+                     "sheep", "sofa", "train", "tvmonitor" };
+}
+
 ///
 /// \brief OCVDNNDetector::Init
 /// \return

src/Detector/OCVDNNDetector.h

@@ -14,6 +14,7 @@ class OCVDNNDetector final : public BaseDetector
 {
 public:
     OCVDNNDetector(const cv::UMat& colorFrame);
+    OCVDNNDetector(const cv::Mat& colorFrame);
     ~OCVDNNDetector(void) = default;
 
     bool Init(const config_t& config) override;

src/Detector/PedestrianDetector.cpp

@@ -6,8 +6,17 @@
 /// \param gray
 ///
 PedestrianDetector::PedestrianDetector(const cv::UMat& gray)
-    :
-      BaseDetector(gray),
+    : BaseDetector(gray),
+      m_scannerC4(HUMAN_height, HUMAN_width, HUMAN_xdiv, HUMAN_ydiv, 256, 0.8)
+{
+}
+
+///
+/// \brief PedestrianDetector::PedestrianDetector
+/// \param gray
+///
+PedestrianDetector::PedestrianDetector(const cv::Mat& gray)
+    : BaseDetector(gray),
       m_scannerC4(HUMAN_height, HUMAN_width, HUMAN_xdiv, HUMAN_ydiv, 256, 0.8)
 {
 }

src/Detector/PedestrianDetector.h

@@ -16,6 +16,7 @@ class PedestrianDetector final : public BaseDetector
     };
 
     PedestrianDetector(const cv::UMat& gray);
+    PedestrianDetector(const cv::Mat& gray);
     ~PedestrianDetector(void) = default;
 
     bool Init(const config_t& config) override;