From 54f83e153549dd1a63bcc8fa5e55fb171621a989 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 17 Jan 2018 18:05:07 +0000
Subject: [PATCH] Some fixes
---
src/yolo_v2_class.hpp | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/yolo_v2_class.hpp b/src/yolo_v2_class.hpp
index 5afb22f..78cc67b 100644
--- a/src/yolo_v2_class.hpp
+++ b/src/yolo_v2_class.hpp
@@ -8,11 +8,6 @@
#include <opencv2/opencv.hpp> // C++
#include "opencv2/highgui/highgui_c.h" // C
#include "opencv2/imgproc/imgproc_c.h" // C
-
-#include <opencv2/cudaoptflow.hpp>
-#include <opencv2/cudaimgproc.hpp>
-#include <opencv2/cudaarithm.hpp>
-#include <opencv2/core/cuda.hpp>
#endif // OPENCV
#ifdef YOLODLL_EXPORTS
@@ -95,8 +90,6 @@
{
cv::Mat img;
cv::cvtColor(img_src, img, cv::COLOR_RGB2BGR);
- //std::cout << "\n img_rgb: " << img_rgb.size() << ", " << img_rgb.type() << ", " << img_rgb.channels() << std::endl;
- //std::cout << "\n img: " << img.size() << ", " << img.type() << ", " << img.channels() << std::endl;
std::shared_ptr<image_t> image_ptr(new image_t, [](image_t *img) { free_image(*img); delete img; });
std::shared_ptr<IplImage> ipl_small = std::make_shared<IplImage>(img);
*image_ptr = ipl_to_image(ipl_small.get());
@@ -115,20 +108,14 @@
image_t out = make_image_custom(w, h, c);
int count = 0;
- //std::vector<unsigned char> tmp(w*h*c);
-
for (int k = 0; k < c; ++k) {
for (int i = 0; i < h; ++i) {
int i_step = i*step;
for (int j = 0; j < w; ++j) {
out.data[count++] = data[i_step + j*c + k] / 255.;
- //tmp[count++] = data[i_step + j*c + k];
}
}
}
- //cv::Mat wrapped_8bit(cv::Size(w, h), CV_8UC3, tmp.data());
- //cv::Mat wrapped_32float(cv::Size(w, h), CV_32FC3, out.data);
- //wrapped_8bit.convertTo(wrapped_32float, CV_32FC3, 1 / 255.);
return out;
}
@@ -157,6 +144,11 @@
#if defined(TRACK_OPTFLOW) && defined(OPENCV)
+#include <opencv2/cudaoptflow.hpp>
+#include <opencv2/cudaimgproc.hpp>
+#include <opencv2/cudaarithm.hpp>
+#include <opencv2/core/cuda.hpp>
+
class Tracker_optflow {
public:
const int gpu_count;
@@ -172,7 +164,7 @@
sync_PyrLKOpticalFlow_gpu = cv::cuda::SparsePyrLKOpticalFlow::create();
sync_PyrLKOpticalFlow_gpu->setWinSize(cv::Size(21, 21)); // 15, 21, 31
- sync_PyrLKOpticalFlow_gpu->setMaxLevel(3); // +- 5 ptx
+ sync_PyrLKOpticalFlow_gpu->setMaxLevel(3); // +- 3 pt
sync_PyrLKOpticalFlow_gpu->setNumIters(2000); // def: 30
cv::cuda::setDevice(old_gpu_id);
@@ -238,8 +230,6 @@
return cur_bbox_vec;
}
- //return cur_bbox_vec;
-
cv::Mat prev_pts, prev_pts_flow_cpu, cur_pts_flow_cpu;
for (auto &i : cur_bbox_vec) {
--
Gitblit v1.10.0