Removed random=1 from resnet152_yolo.cfg. Until resize_network() isn't supp...

AlexeyAB

2018-03-05 ae1768e5831caa95214b93b08ee711aede36df07

 src/yolo_v2_class.cpp

@@ -33,7 +33,6 @@
   unsigned int *track_id;
};


YOLODLL_API Detector::Detector(std::string cfg_filename, std::string weight_filename, int gpu_id) : cur_gpu_id(gpu_id)
{
   wait_stream = 0;
@@ -252,7 +251,8 @@
   return bbox_vec;
}

YOLODLL_API std::vector<bbox_t> Detector::tracking_id(std::vector<bbox_t> cur_bbox_vec, int const frames_story, int const max_dist)
YOLODLL_API std::vector<bbox_t> Detector::tracking_id(std::vector<bbox_t> cur_bbox_vec, bool const change_history, 
   int const frames_story, int const max_dist)
{
   detector_gpu_t &det_gpu = *reinterpret_cast<detector_gpu_t *>(detector_gpu_ptr.get());

@@ -301,8 +301,10 @@
      if (cur_bbox_vec[i].track_id == 0)
         cur_bbox_vec[i].track_id = det_gpu.track_id[cur_bbox_vec[i].obj_id]++;

   prev_bbox_vec_deque.push_front(cur_bbox_vec);
   if (prev_bbox_vec_deque.size() > frames_story) prev_bbox_vec_deque.pop_back();
   if (change_history) {
      prev_bbox_vec_deque.push_front(cur_bbox_vec);
      if (prev_bbox_vec_deque.size() > frames_story) prev_bbox_vec_deque.pop_back();
   }

   return cur_bbox_vec;
}