From 0305fb4d99cf1efc7d4aa4d2ee2d65d54500d437 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 26 Nov 2015 19:48:01 +0000
Subject: [PATCH] Some changes
---
src/coco_kernels.cu | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/src/coco_kernels.cu b/src/coco_kernels.cu
index a3b4875..2ec0915 100644
--- a/src/coco_kernels.cu
+++ b/src/coco_kernels.cu
@@ -10,6 +10,7 @@
#include "parser.h"
#include "box.h"
#include "image.h"
+#include <sys/time.h>
}
#ifdef OPENCV
@@ -17,7 +18,9 @@
#include "opencv2/imgproc/imgproc.hpp"
extern "C" image ipl_to_image(IplImage* src);
extern "C" void convert_coco_detections(float *predictions, int classes, int num, int square, int side, int w, int h, float thresh, float **probs, box *boxes, int only_objectness);
-extern "C" void draw_coco(image im, int num, float thresh, box *boxes, float **probs);
+
+extern "C" char *coco_classes[];
+extern "C" image *coco_labels;
static float **probs;
static box *boxes;
@@ -27,9 +30,10 @@
static image det ;
static image det_s;
static image disp ;
-static cv::VideoCapture cap(0);
+static cv::VideoCapture cap;
+static float fps = 0;
-void *fetch_in_thread(void *ptr)
+void *fetch_in_thread_coco(void *ptr)
{
cv::Mat frame_m;
cap >> frame_m;
@@ -40,7 +44,7 @@
return 0;
}
-void *detect_in_thread(void *ptr)
+void *detect_in_thread_coco(void *ptr)
{
float nms = .4;
float thresh = .2;
@@ -53,12 +57,13 @@
if (nms > 0) do_nms(boxes, probs, l.side*l.side*l.n, l.classes, nms);
printf("\033[2J");
printf("\033[1;1H");
- printf("\nObjects:\n\n");
- draw_coco(det, l.side*l.side*l.n, thresh, boxes, probs);
+ printf("\nFPS:%.0f\n",fps);
+ printf("Objects:\n\n");
+ draw_detections(det, l.side*l.side*l.n, thresh, boxes, probs, coco_classes, coco_labels, 80);
return 0;
}
-extern "C" void demo_coco(char *cfgfile, char *weightfile, float thresh)
+extern "C" void demo_coco(char *cfgfile, char *weightfile, float thresh, int cam_index)
{
printf("YOLO demo\n");
net = parse_network_cfg(cfgfile);
@@ -69,6 +74,8 @@
srand(2222222);
+ cv::VideoCapture cam(cam_index);
+ cap = cam;
if(!cap.isOpened()) error("Couldn't connect to webcam.\n");
detection_layer l = net.layers[net.n-1];
@@ -81,19 +88,21 @@
pthread_t fetch_thread;
pthread_t detect_thread;
- fetch_in_thread(0);
+ fetch_in_thread_coco(0);
det = in;
det_s = in_s;
- fetch_in_thread(0);
- detect_in_thread(0);
+ fetch_in_thread_coco(0);
+ detect_in_thread_coco(0);
disp = det;
det = in;
det_s = in_s;
while(1){
- if(pthread_create(&fetch_thread, 0, fetch_in_thread, 0)) error("Thread creation failed");
- if(pthread_create(&detect_thread, 0, detect_in_thread, 0)) error("Thread creation failed");
+ struct timeval tval_before, tval_after, tval_result;
+ gettimeofday(&tval_before, NULL);
+ if(pthread_create(&fetch_thread, 0, fetch_in_thread_coco, 0)) error("Thread creation failed");
+ if(pthread_create(&detect_thread, 0, detect_in_thread_coco, 0)) error("Thread creation failed");
show_image(disp, "YOLO");
free_image(disp);
cvWaitKey(1);
@@ -103,10 +112,15 @@
disp = det;
det = in;
det_s = in_s;
+
+ gettimeofday(&tval_after, NULL);
+ timersub(&tval_after, &tval_before, &tval_result);
+ float curr = 1000000.f/((long int)tval_result.tv_usec);
+ fps = .9*fps + .1*curr;
}
}
#else
-extern "C" void demo_coco(char *cfgfile, char *weightfile, float thresh){
+extern "C" void demo_coco(char *cfgfile, char *weightfile, float thresh, int cam_index){
fprintf(stderr, "YOLO-COCO demo needs OpenCV for webcam images.\n");
}
#endif
--
Gitblit v1.10.0