Tracking fixed

AlexeyAB

2018-01-04 e205c1e7aeb47e3dffd35d1b5ce7841d24b9aff4

 src/yolo_console_dll.cpp

@@ -93,8 +93,8 @@
   std::string filename;
   if (argc > 1) filename = argv[1];

   //Detector detector("cfg/yolo-voc.cfg", "yolo-voc.weights");
   Detector detector("tiny-yolo-voc_air.cfg", "backup/tiny-yolo-voc_air_5000.weights");
   Detector detector("cfg/yolo-voc.cfg", "yolo-voc.weights");
   //Detector detector("tiny-yolo-voc_air.cfg", "backup/tiny-yolo-voc_air_5000.weights");

   auto obj_names = objects_names_from_file("data/voc.names");
   std::string out_videofile = "result.avi";
@@ -158,59 +158,27 @@
                     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;
                  }

#ifdef TRACK_OPTFLOW
                  int y = 0, x = 0;
                  cv::Mat show_flow = cur_frame.clone();
                  auto lambda = [&x, &y](cv::Mat draw_frame, cv::Mat src_frame, std::vector<bbox_t> result_vec) {
                     //if (x > 10) return;
                     if (result_vec.size() == 0) return;
                     bbox_t i = result_vec[0];
                     //cv::Rect r(i.x, i.y, i.w, i.h);
                     cv::Rect r(i.x + (i.w-31)/2, i.y + (i.h - 31)/2, 31, 31);
                     cv::Rect img_rect(cv::Point2i(0, 0), src_frame.size());
                     cv::Rect rect_roi = r & img_rect;
                     if (rect_roi.width < 1 || rect_roi.height < 1) return;
                     cv::Mat roi = src_frame(rect_roi);
                     cv::Mat dst;
                     cv::resize(roi, dst, cv::Size(100, 100));
                     if (x > 10) x = 0, ++y;
                     cv::Rect dst_rect_roi(cv::Point2i(x*100, y*100), dst.size());
                     cv::Mat dst_roi = draw_frame(dst_rect_roi);
                     dst.copyTo(dst_roi);
                     // track optical flow
                     if (track_optflow_queue.size() > 0) {
                        std::queue<cv::Mat> new_track_optflow_queue;
                        //std::cout << "\n !!!! all = " << track_optflow_queue.size() << ", cur = " << passed_flow_frames << std::endl;
                        tracker_flow.update_tracking_flow(track_optflow_queue.front());

                     ++x;
                  };


                  // track optical flow
                  if (track_optflow_queue.size() > 0) {
                     std::queue<cv::Mat> new_track_optflow_queue;
                     std::cout << "\n !!!! all = " << track_optflow_queue.size() << ", cur = " << passed_flow_frames << std::endl;
                     //draw_boxes(track_optflow_queue.front().clone(), result_vec, obj_names, 3, current_det_fps, current_cap_fps);
                     //cv::waitKey(10);
                     tracker_flow.update_tracking_flow(track_optflow_queue.front());
                     lambda(show_flow, track_optflow_queue.front(), result_vec);
                     track_optflow_queue.pop();
                     while(track_optflow_queue.size() > 0) {
                        //draw_boxes(track_optflow_queue.front().clone(), result_vec, obj_names, 3, current_det_fps, current_cap_fps);
                        //cv::waitKey(10);
                        result_vec = tracker_flow.tracking_flow(track_optflow_queue.front(), result_vec);
                        if (track_optflow_queue.size() <= passed_flow_frames && new_track_optflow_queue.size() == 0)
                           new_track_optflow_queue = track_optflow_queue;
                        lambda(show_flow, track_optflow_queue.front(), result_vec);
                        track_optflow_queue.pop();
                     }					
                     track_optflow_queue = new_track_optflow_queue;
                     new_track_optflow_queue.swap(std::queue<cv::Mat>());
                     passed_flow_frames = 0;
                     std::cout << "\n !!!! now = " << track_optflow_queue.size() << ", cur = " << passed_flow_frames << std::endl;
                        while (track_optflow_queue.size() > 0) {
                           result_vec = tracker_flow.tracking_flow(track_optflow_queue.front(), result_vec);
                           if (track_optflow_queue.size() <= passed_flow_frames && new_track_optflow_queue.size() == 0)
                              new_track_optflow_queue = track_optflow_queue;

                     cv::imshow("flow", show_flow);
                     cv::waitKey(3);
                           track_optflow_queue.pop();
                        }
                        track_optflow_queue = new_track_optflow_queue;
                        new_track_optflow_queue.swap(std::queue<cv::Mat>());
                        passed_flow_frames = 0;
                     }
                  }
#endif

@@ -222,7 +190,8 @@
                     consumed = true;
                     while (current_image.use_count() > 0) {
                        auto result = detector.detect_resized(*current_image, frame_size, 0.24, false);  // true
                        Sleep(500);
                        //Sleep(200);
                        Sleep(50);
                        ++fps_det_counter;
                        std::unique_lock<std::mutex> lock(mtx);
                        thread_result_vec = result;