From 8f3d2d04216db8c2952f5e1385eb4d15c2d08ac7 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Fri, 07 Apr 2017 15:21:07 +0000
Subject: [PATCH] Fixed cfg-files
---
src/demo.c | 130 ++++++++++++++++++++++++++-----------------
1 files changed, 78 insertions(+), 52 deletions(-)
diff --git a/src/demo.c b/src/demo.c
index d05ff6b..7a90480 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -1,25 +1,26 @@
#include "network.h"
#include "detection_layer.h"
+#include "region_layer.h"
#include "cost_layer.h"
#include "utils.h"
#include "parser.h"
#include "box.h"
#include "image.h"
#include "demo.h"
-#include <sys/time.h>
+//#include <sys/time.h>
+#include <time.h>
+#include <winsock.h>
+#include "gettimeofday.h"
#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 0
-static int delay = DELAY;
+image get_image_from_stream(CvCapture *cap);
static char **demo_names;
-static image *demo_labels;
+static image **demo_alphabet;
static int demo_classes;
static float **probs;
@@ -43,14 +44,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;
}
@@ -58,18 +54,23 @@
{
float nms = .4;
- detection_layer l = net.layers[net.n-1];
+ layer l = net.layers[net.n-1];
float *X = det_s.data;
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);
+ l.output = 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);
+ if(l.type == DETECTION){
+ get_detection_boxes(l, 1, 1, demo_thresh, probs, boxes, 0);
+ } else if (l.type == REGION){
+ get_region_boxes(l, 1, 1, demo_thresh, probs, boxes, 0, 0);
+ } else {
+ error("Last layer must produce detections\n");
+ }
+ if (nms > 0) do_nms(boxes, probs, l.w*l.h*l.n, l.classes, nms);
printf("\033[2J");
printf("\033[1;1H");
printf("\nFPS:%.1f\n",fps);
@@ -79,12 +80,8 @@
det = images[(demo_index + FRAMES/2 + 1)%FRAMES];
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;
- }
+ draw_detections(det, l.w*l.h*l.n, demo_thresh, boxes, probs, demo_names, demo_alphabet, demo_classes);
+
return 0;
}
@@ -97,10 +94,13 @@
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)
+void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, int classes, int frame_skip, char *prefix)
{
+ //skip = frame_skip;
+ image **alphabet = load_alphabet();
+ int delay = frame_skip;
demo_names = names;
- demo_labels = labels;
+ demo_alphabet = alphabet;
demo_classes = classes;
demo_thresh = thresh;
printf("Demo\n");
@@ -113,6 +113,7 @@
srand(2222222);
if(filename){
+ printf("video file: %s\n", filename);
cap = cvCaptureFromFile(filename);
}else{
cap = cvCaptureFromCAM(cam_index);
@@ -120,16 +121,16 @@
if(!cap) error("Couldn't connect to webcam.\n");
- detection_layer l = net.layers[net.n-1];
+ layer l = net.layers[net.n-1];
int j;
avg = (float *) calloc(l.outputs, sizeof(float));
for(j = 0; j < FRAMES; ++j) predictions[j] = (float *) calloc(l.outputs, sizeof(float));
for(j = 0; j < FRAMES; ++j) images[j] = make_image(1,1,3);
- boxes = (box *)calloc(l.side*l.side*l.n, sizeof(box));
- 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 *));
+ boxes = (box *)calloc(l.w*l.h*l.n, sizeof(box));
+ probs = (float **)calloc(l.w*l.h*l.n, sizeof(float *));
+ for(j = 0; j < l.w*l.h*l.n; ++j) probs[j] = (float *)calloc(l.classes, sizeof(float *));
pthread_t fetch_thread;
pthread_t detect_thread;
@@ -153,35 +154,60 @@
}
int count = 0;
- cvNamedWindow("Demo", CV_WINDOW_NORMAL);
- cvMoveWindow("Demo", 0, 0);
- cvResizeWindow("Demo", 1352, 1013);
+ if(!prefix){
+ cvNamedWindow("Demo", CV_WINDOW_NORMAL);
+ cvMoveWindow("Demo", 0, 0);
+ cvResizeWindow("Demo", 1352, 1013);
+ }
double before = get_wall_time();
while(1){
++count;
- 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");
- show_image(disp, "Demo");
- cvWaitKey(1);
- //char buff[256];
- //sprintf(buff, "coco/coco_%05d", count);
- //save_image(disp, buff);
+ if(!prefix){
+ 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;
+ }
+ }else{
+ char buff[256];
+ sprintf(buff, "%s_%08d", prefix, count);
+ save_image(disp, buff);
+ }
- //free_image(disp);
- //cvWaitKey(10);
- pthread_join(fetch_thread, 0);
- pthread_join(detect_thread, 0);
+ pthread_join(fetch_thread, 0);
+ pthread_join(detect_thread, 0);
- disp = det;
- det = in;
- det_s = in_s;
+ 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;
- if(delay == DELAY){
double after = get_wall_time();
float curr = 1./(after - before);
fps = curr;
@@ -190,7 +216,7 @@
}
}
#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, int classes, int frame_skip, char *prefix)
{
fprintf(stderr, "Demo needs OpenCV for webcam images.\n");
}
--
Gitblit v1.10.0