Update Readme.md - fixed typo

Alexey

2017-11-28 617cf313ccb1fe005db3f7d88dec04a04bd97cc2

 src/yolo_console_dll.cpp

@@ -8,7 +8,9 @@
#include <mutex>              // std::mutex, std::unique_lock
#include <condition_variable> // std::condition_variable

#ifdef _WIN32
#define OPENCV
#endif

#include "yolo_v2_class.hpp"  // imported functions from DLL

@@ -17,11 +19,13 @@
#include "opencv2/core/version.hpp"
#ifndef CV_VERSION_EPOCH
#include "opencv2/videoio/videoio.hpp"
#pragma comment(lib, "opencv_world320.lib")  
#define OPENCV_VERSION CVAUX_STR(CV_VERSION_MAJOR)""CVAUX_STR(CV_VERSION_MINOR)""CVAUX_STR(CV_VERSION_REVISION)
#pragma comment(lib, "opencv_world" OPENCV_VERSION ".lib")
#else
#pragma comment(lib, "opencv_core2413.lib")  
#pragma comment(lib, "opencv_imgproc2413.lib")  
#pragma comment(lib, "opencv_highgui2413.lib") 
#define OPENCV_VERSION CVAUX_STR(CV_VERSION_EPOCH)""CVAUX_STR(CV_VERSION_MAJOR)""CVAUX_STR(CV_VERSION_MINOR)
#pragma comment(lib, "opencv_core" OPENCV_VERSION ".lib")
#pragma comment(lib, "opencv_imgproc" OPENCV_VERSION ".lib")
#pragma comment(lib, "opencv_highgui" OPENCV_VERSION ".lib")
#endif


@@ -70,7 +74,7 @@
   std::ifstream file(filename);
   std::vector<std::string> file_lines;
   if (!file.is_open()) return file_lines;
   for(std::string line; file >> line;) file_lines.push_back(line);
   for(std::string line; getline(file, line);) file_lines.push_back(line);
   std::cout << "object names loaded \n";
   return file_lines;
}
@@ -81,7 +85,7 @@
   std::string filename;
   if (argc > 1) filename = argv[1];

   Detector detector("yolo-voc.cfg", "yolo-voc.weights");
   Detector detector("cfg/yolo-voc.cfg", "yolo-voc.weights");

   auto obj_names = objects_names_from_file("data/voc.names");
   std::string out_videofile = "result.avi";
@@ -98,9 +102,10 @@
         std::string const file_ext = filename.substr(filename.find_last_of(".") + 1);
         std::string const protocol = filename.substr(0, 7);
         if (file_ext == "avi" || file_ext == "mp4" || file_ext == "mjpg" || file_ext == "mov" ||  // video file
            protocol == "rtsp://" || protocol == "http://" || protocol == "https:/")   // video network stream
            protocol == "rtmp://" || protocol == "rtsp://" || protocol == "http://" || protocol == "https:/")  // video network stream
         {
            cv::Mat cap_frame, cur_frame, det_frame, write_frame;
            std::shared_ptr<image_t> det_image;
            std::vector<bbox_t> result_vec, thread_result_vec;
            detector.nms = 0.02; // comment it - if track_id is not required
            std::atomic<bool> consumed, videowrite_ready;
@@ -116,9 +121,10 @@
            std::chrono::steady_clock::time_point steady_start, steady_end;
            cv::VideoCapture cap(filename); cap >> cur_frame;
            int const video_fps = cap.get(CV_CAP_PROP_FPS);
            cv::Size const frame_size = cur_frame.size();
            cv::VideoWriter output_video;
            if (save_output_videofile)
               output_video.open(out_videofile, CV_FOURCC('D', 'I', 'V', 'X'), std::max(35, video_fps), cur_frame.size(), true);
               output_video.open(out_videofile, CV_FOURCC('D', 'I', 'V', 'X'), std::max(35, video_fps), frame_size, true);

            while (!cur_frame.empty()) {
               if (t_cap.joinable()) {
@@ -132,7 +138,7 @@
               if(consumed)
               {
                  std::unique_lock<std::mutex> lock(mtx);
                  cur_frame.copyTo(det_frame);
                  det_image = detector.mat_to_image_resize(cur_frame);
                  result_vec = thread_result_vec;
                  result_vec = detector.tracking(result_vec);  // comment it - if track_id is not required
                  consumed = false;
@@ -140,14 +146,14 @@
               // launch thread once
               if (!t_detect.joinable()) {
                  t_detect = std::thread([&]() {
                     cv::Mat current_mat = det_frame.clone();
                     auto current_image = det_image;
                     consumed = true;
                     while (!current_mat.empty()) {
                        auto result = detector.detect(current_mat, 0.24, true);
                     while (current_image.use_count() > 0) {
                        auto result = detector.detect_resized(*current_image, frame_size, 0.24, true);
                        ++fps_det_counter;
                        std::unique_lock<std::mutex> lock(mtx);
                        thread_result_vec = result;
                        current_mat = det_frame.clone();
                        current_image = det_image;
                        consumed = true;
                        cv.notify_all();
                     }
@@ -214,7 +220,7 @@
         auto img = detector.load_image(filename);
         std::vector<bbox_t> result_vec = detector.detect(img);
         detector.free_image(img);
         show_result(result_vec, obj_names);
         show_console_result(result_vec, obj_names);
#endif         
      }
      catch (std::exception &e) { std::cerr << "exception: " << e.what() << "\n"; getchar(); }