From 5bc62b14e06a3fcfda4e3a19fba77589920eddee Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 03 Jul 2017 11:12:52 +0000
Subject: [PATCH] Memory leak fixed
---
src/yolo_v2_class.hpp | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/yolo_v2_class.hpp b/src/yolo_v2_class.hpp
index e3d7933..34e220a 100644
--- a/src/yolo_v2_class.hpp
+++ b/src/yolo_v2_class.hpp
@@ -1,6 +1,8 @@
#pragma once
#include <memory>
#include <vector>
+#include <deque>
+#include <algorithm>
#ifdef OPENCV
#include <opencv2/opencv.hpp> // C++
@@ -18,6 +20,7 @@
unsigned int x, y, w, h; // (x,y) - top-left corner, (w, h) - width & height of bounded box
float prob; // confidence - probability that the object was found correctly
unsigned int obj_id; // class of object - from range [0, classes-1]
+ unsigned int track_id; // tracking id for video (0 - untracked, 1 - inf - tracked object)
};
struct image_t {
@@ -31,6 +34,7 @@
class Detector {
std::shared_ptr<void> detector_gpu_ptr;
public:
+ float nms = .4;
YOLODLL_API Detector(std::string cfg_filename, std::string weight_filename, int gpu_id = 0);
YOLODLL_API ~Detector();
@@ -40,6 +44,8 @@
static YOLODLL_API image_t load_image(std::string image_filename);
static YOLODLL_API void free_image(image_t m);
+ YOLODLL_API std::vector<bbox_t> tracking(std::vector<bbox_t> cur_bbox_vec, int const frames_story = 4);
+
#ifdef OPENCV
std::vector<bbox_t> detect(cv::Mat mat, float thresh = 0.2)
{
@@ -107,6 +113,8 @@
}
#endif // OPENCV
+
+ std::deque<std::vector<bbox_t>> prev_bbox_vec_deque;
};
--
Gitblit v1.10.0