From a6b2511a566f77a0838dc1dd0d5f3e3c49a8faa0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sat, 25 Jun 2016 23:13:54 +0000
Subject: [PATCH] idk
---
src/demo.c | 113 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 66 insertions(+), 47 deletions(-)
diff --git a/src/demo.c b/src/demo.c
index bd8f2c2..0b870cf 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -8,16 +8,13 @@
#include "demo.h"
#include <sys/time.h>
-#define FRAMES 1
+#define FRAMES 3
#ifdef OPENCV
#include "opencv2/highgui/highgui_c.h"
#include "opencv2/imgproc/imgproc_c.h"
void convert_detections(float *predictions, int classes, int num, int square, int side, int w, int h, float thresh, float **probs, box *boxes, int only_objectness);
-#define DELAY 5
-static int delay = DELAY;
-
static char **demo_names;
static image *demo_labels;
static int demo_classes;
@@ -43,14 +40,9 @@
{
in = get_image_from_stream(cap);
if(!in.data){
- in = disp;
- if(delay == DELAY) error("Stream closed.");
- }else{
- if(disp.data){
- free_image(disp);
- }
- in_s = resize_image(in, net.w, net.h);
+ error("Stream closed.");
}
+ in_s = resize_image(in, net.w, net.h);
return 0;
}
@@ -63,16 +55,14 @@
float *prediction = network_predict(net, X);
memcpy(predictions[demo_index], prediction, l.outputs*sizeof(float));
- if(delay == DELAY){
- mean_arrays(predictions, FRAMES, l.outputs, avg);
- }
+ mean_arrays(predictions, FRAMES, l.outputs, avg);
free_image(det_s);
convert_detections(avg, l.classes, l.n, l.sqrt, l.side, 1, 1, demo_thresh, probs, boxes, 0);
if (nms > 0) do_nms(boxes, probs, l.side*l.side*l.n, l.classes, nms);
printf("\033[2J");
printf("\033[1;1H");
- printf("\nFPS:%.0f\n",fps);
+ printf("\nFPS:%.1f\n",fps);
printf("Objects:\n\n");
images[demo_index] = det;
@@ -80,16 +70,23 @@
demo_index = (demo_index + 1)%FRAMES;
draw_detections(det, l.side*l.side*l.n, demo_thresh, boxes, probs, demo_names, demo_labels, demo_classes);
- if(delay == 0){
- delay = DELAY;
- } else {
- --delay;
- }
+
return 0;
}
-void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, image *labels, int classes)
+double get_wall_time()
{
+ struct timeval time;
+ if (gettimeofday(&time,NULL)){
+ return 0;
+ }
+ return (double)time.tv_sec + (double)time.tv_usec * .000001;
+}
+
+void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, image *labels, int classes, int frame_skip)
+{
+ //skip = frame_skip;
+ int delay = frame_skip;
demo_names = names;
demo_labels = labels;
demo_classes = classes;
@@ -110,8 +107,6 @@
}
if(!cap) error("Couldn't connect to webcam.\n");
- //cvNamedWindow("COCO", CV_WINDOW_NORMAL);
- //cvResizeWindow("COCO", 512, 512);
detection_layer l = net.layers[net.n-1];
int j;
@@ -124,8 +119,8 @@
probs = (float **)calloc(l.side*l.side*l.n, sizeof(float *));
for(j = 0; j < l.side*l.side*l.n; ++j) probs[j] = (float *)calloc(l.classes, sizeof(float *));
-// pthread_t fetch_thread;
- // pthread_t detect_thread;
+ pthread_t fetch_thread;
+ pthread_t detect_thread;
fetch_in_thread(0);
det = in;
@@ -146,37 +141,61 @@
}
int count = 0;
+ cvNamedWindow("Demo", CV_WINDOW_NORMAL);
+ cvMoveWindow("Demo", 0, 0);
+ cvResizeWindow("Demo", 1352, 1013);
+
+ double before = get_wall_time();
+
while(1){
++count;
- struct timeval tval_before, tval_after, tval_result;
- gettimeofday(&tval_before, NULL);
- //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");
- fetch_in_thread(0);
- detect_in_thread(0);
+ if(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");
- disp = det;
- det = in;
- det_s = in_s;
+ show_image(disp, "Demo");
+ int c = cvWaitKey(1);
+ if (c == 10){
+ if(frame_skip == 0) frame_skip = 60;
+ else if(frame_skip == 4) frame_skip = 0;
+ else if(frame_skip == 60) frame_skip = 4;
+ else frame_skip = 0;
+ }
- //show_image(disp, "COCO");
- char buff[256];
- sprintf(buff, "coco/coco_%05d", count);
- save_image(disp, buff);
+ pthread_join(fetch_thread, 0);
+ pthread_join(detect_thread, 0);
- //free_image(disp);
- //cvWaitKey(10);
- //pthread_join(fetch_thread, 0);
- //pthread_join(detect_thread, 0);
+ if(delay == 0){
+ free_image(disp);
+ disp = det;
+ }
+ det = in;
+ det_s = in_s;
+ }else {
+ fetch_in_thread(0);
+ det = in;
+ det_s = in_s;
+ detect_in_thread(0);
+ if(delay == 0) {
+ free_image(disp);
+ disp = det;
+ }
+ show_image(disp, "Demo");
+ cvWaitKey(1);
+ }
+ --delay;
+ if(delay < 0){
+ delay = frame_skip;
- 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;
+ double after = get_wall_time();
+ float curr = 1./(after - before);
+ fps = curr;
+ before = after;
+ }
}
}
#else
-void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, image *labels, int classes)
+void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, image *labels, int classes, int frame_skip)
{
fprintf(stderr, "Demo needs OpenCV for webcam images.\n");
}
--
Gitblit v1.10.0