Alexey
2017-08-03 de625aa4a7fc5b6b1a7fd1b9a4c13d06b3a8c9a1
src/yolo_console_dll.cpp
@@ -9,12 +9,19 @@
#include "yolo_v2_class.hpp"  // imported functions from DLL
#ifdef OPENCV
#include <opencv2/opencv.hpp>       // C++
#pragma comment(lib, "opencv_core249.lib")
#pragma comment(lib, "opencv_imgproc249.lib")
#pragma comment(lib, "opencv_highgui249.lib")
#include "opencv2/core/version.hpp"
#ifndef CV_VERSION_EPOCH
#include "opencv2/videoio/videoio.hpp"
#pragma comment(lib, "opencv_world320.lib")
#else
#pragma comment(lib, "opencv_core2413.lib")
#pragma comment(lib, "opencv_imgproc2413.lib")
#pragma comment(lib, "opencv_highgui2413.lib")
#endif
void draw_boxes(cv::Mat mat_img, std::vector<bbox_t> result_vec, std::vector<std::string> obj_names, unsigned int wait_msec = 0) {
   for (auto &i : result_vec) {
      cv::Scalar color(60, 160, 260);
@@ -66,14 +73,21 @@
#ifdef OPENCV
         std::string const file_ext = filename.substr(filename.find_last_of(".") + 1);
         if (file_ext == "avi" || file_ext == "mp4" || file_ext == "mjpg" || file_ext == "mov") {  // video file
            cv::Mat frame;
            cv::Mat frame, prev_frame;
            std::vector<bbox_t> result_vec, thread_result_vec;
            detector.nms = 0.02; // comment it - if track_id is not required
            for(cv::VideoCapture cap(filename); cap >> frame, cap.isOpened();) {
               std::vector<bbox_t> result_vec = detector.detect(frame, 0.2);
               result_vec = detector.tracking(result_vec);  // comment it - if track_id is not required
            for (cv::VideoCapture cap(filename); cap >> frame, cap.isOpened();) {
               auto image_ptr = detector.mat_to_image(frame);
               std::thread td([&]() { thread_result_vec = detector.detect(*image_ptr, 0.2); });
               draw_boxes(frame, result_vec, obj_names, 3);
               show_result(result_vec, obj_names);
               if (!prev_frame.empty()) {
                  result_vec = detector.tracking(result_vec);  // comment it - if track_id is not required
                  draw_boxes(prev_frame, result_vec, obj_names, 3);
                  show_result(result_vec, obj_names);
               }
               td.join();
               prev_frame = frame;
               result_vec = thread_result_vec;
            }
         }
         else {   // image file