AlexeyAB
2017-08-04 e34f0416f507499e9dbbc2557430850ba3a022ab
src/yolo_console_dll.cpp
@@ -73,23 +73,34 @@
#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, prev_frame;
            cv::Mat frame, prev_frame, det_frame;
            std::vector<bbox_t> result_vec, thread_result_vec;
            detector.nms = 0.02; // comment it - if track_id is not required
            std::thread td([]() {});
            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); });
               td.join();
               result_vec = thread_result_vec;
               det_frame = frame;
               td = std::thread([&]() { thread_result_vec = detector.detect(det_frame, 0.2, true); });
               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 if (file_ext == "txt") { // list of image files
            std::ifstream file(filename);
            if (!file.is_open()) std::cout << "File not found! \n";
            else
               for (std::string line; file >> line;) {
                  std::cout << line << std::endl;
                  show_result(detector.detect(cv::imread(line)), obj_names);
               }
         }
         else {   // image file
            cv::Mat mat_img = cv::imread(filename);
            std::vector<bbox_t> result_vec = detector.detect(mat_img);