Fixed saving video file

AlexeyAB

2018-03-05 f0bc634a74b14ce4b0e065011390940d4d7a254c

 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;
@@ -180,11 +179,12 @@
   cudaGetDevice(&old_gpu_index);
   if(cur_gpu_id != old_gpu_index)
      cudaSetDevice(net.gpu_index);

   net.wait_stream = wait_stream;   // 1 - wait CUDA-stream, 0 - not to wait
#endif
   //std::cout << "net.gpu_index = " << net.gpu_index << std::endl;

   //float nms = .4;
   net.wait_stream = wait_stream;   // 1 - wait CUDA-stream, 0 - not to wait

   image im;
   im.c = img.c;
@@ -251,7 +251,8 @@
   return bbox_vec;
}

YOLODLL_API std::vector<bbox_t> Detector::tracking(std::vector<bbox_t> cur_bbox_vec, int const frames_story)
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());

@@ -278,7 +279,7 @@
               float center_x_diff = (float)(i.x + i.w/2) - (float)(k.x + k.w/2);
               float center_y_diff = (float)(i.y + i.h/2) - (float)(k.y + k.h/2);
               unsigned int cur_dist = sqrt(center_x_diff*center_x_diff + center_y_diff*center_y_diff);
               if (cur_dist < 100 && (k.track_id == 0 || dist_vec[m] > cur_dist)) {
               if (cur_dist < max_dist && (k.track_id == 0 || dist_vec[m] > cur_dist)) {
                  dist_vec[m] = cur_dist;
                  cur_index = m;
               }
@@ -300,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;
}