From 726cebd3fb67d65ec6d2d49fa6bfba4c053085df Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 02 Apr 2018 12:02:53 +0000
Subject: [PATCH] Fixed detector recall
---
src/demo.c | 260 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 200 insertions(+), 60 deletions(-)
diff --git a/src/demo.c b/src/demo.c
index c9114dc..2337a0a 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -1,25 +1,33 @@
#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"
+#ifdef WIN32
+#include <time.h>
+#include <winsock.h>
+#include "gettimeofday.h"
+#else
#include <sys/time.h>
+#endif
-#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);
-
-static int skip = 0;
-static int skipped = 0;
+#include "opencv2/core/version.hpp"
+#ifndef CV_VERSION_EPOCH
+#include "opencv2/videoio/videoio_c.h"
+#endif
+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;
@@ -31,69 +39,111 @@
static image det_s;
static image disp = {0};
static CvCapture * cap;
+static int use_webcam = 0;
static float fps = 0;
static float demo_thresh = 0;
static float *predictions[FRAMES];
static int demo_index = 0;
static image images[FRAMES];
+static IplImage* ipl_images[FRAMES];
static float *avg;
+void draw_detections_cv(IplImage* show_img, int num, float thresh, box *boxes, float **probs, char **names, image **alphabet, int classes);
+void draw_detections_cv_v3(IplImage* show_img, detection *dets, int num, float thresh, char **names, image **alphabet, int classes);
+void show_image_cv_ipl(IplImage *disp, const char *name);
+image get_image_from_stream_resize(CvCapture *cap, int w, int h, IplImage** in_img, int use_webcam);
+IplImage* in_img;
+IplImage* det_img;
+IplImage* show_img;
+
+static int flag_exit;
+
void *fetch_in_thread(void *ptr)
{
- in = get_image_from_stream(cap);
+ //in = get_image_from_stream(cap);
+ in = get_image_from_stream_resize(cap, net.w, net.h, &in_img, use_webcam);
if(!in.data){
- in = disp;
- if(skipped == skip) error("Stream closed.");
- }else{
- if(disp.data){
- free_image(disp);
- }
- in_s = resize_image(in, net.w, net.h);
+ //error("Stream closed.");
+ printf("Stream closed.\n");
+ flag_exit = 1;
+ return EXIT_FAILURE;
}
+ //in_s = resize_image(in, net.w, net.h);
+ in_s = make_image(in.w, in.h, in.c);
+ memcpy(in_s.data, in.data, in.h*in.w*in.c*sizeof(float));
+
return 0;
}
void *detect_in_thread(void *ptr)
{
- float nms = .4;
+ float nms = .45; // 0.4F
- 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(skipped == skip){
- 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);
+ */
+ int letter = 0;
+ int nboxes = 0;
+ detection *dets = get_network_boxes(&net, det.w, det.h, demo_thresh, demo_thresh, 0, 1, &nboxes, letter);
+ if (nms) do_nms_obj_v3(dets, nboxes, 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;
det = images[(demo_index + FRAMES/2 + 1)%FRAMES];
+ ipl_images[demo_index] = det_img;
+ det_img = ipl_images[(demo_index + FRAMES / 2 + 1) % FRAMES];
demo_index = (demo_index + 1)%FRAMES;
+
+ //draw_detections(det, l.w*l.h*l.n, demo_thresh, boxes, probs, demo_names, demo_alphabet, demo_classes);
+ draw_detections_cv_v3(det_img, dets, nboxes, demo_thresh, demo_names, demo_alphabet, demo_classes);
+ //draw_detections_cv(det_img, l.w*l.h*l.n, demo_thresh, boxes, probs, demo_names, demo_alphabet, demo_classes);
+ free(dets);
- draw_detections(det, l.side*l.side*l.n, demo_thresh, boxes, probs, demo_names, demo_labels, demo_classes);
-
- skipped = (skipped + 1)%skip;
- return 0;
+ return 0;
}
-void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, image *labels, int classes, int frame_skip)
+double get_wall_time()
{
- skip = frame_skip;
+ 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, float hier_thresh, int cam_index, const char *filename, char **names, int classes,
+ int frame_skip, char *prefix, char *out_filename, int http_stream_port, int dont_show)
+{
+ //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");
- net = parse_network_cfg(cfgfile);
+ net = parse_network_cfg_custom(cfgfile, 1);
if(weightfile){
load_weights(&net, weightfile);
}
@@ -102,36 +152,45 @@
srand(2222222);
if(filename){
+ printf("video file: %s\n", filename);
cap = cvCaptureFromFile(filename);
}else{
+ printf("Webcam index: %d\n", cam_index);
+#ifdef CV_VERSION_EPOCH // OpenCV 2.x
cap = cvCaptureFromCAM(cam_index);
+#else // OpenCV 3.x
+ use_webcam = 1;
+ cap = get_capture_webcam(cam_index);
+#endif
}
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];
+ 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;
+ flag_exit = 0;
+
+ pthread_t fetch_thread;
+ pthread_t detect_thread;
fetch_in_thread(0);
+ det_img = in_img;
det = in;
det_s = in_s;
fetch_in_thread(0);
detect_in_thread(0);
disp = det;
+ det_img = in_img;
det = in;
det_s = in_s;
@@ -139,42 +198,123 @@
fetch_in_thread(0);
detect_in_thread(0);
disp = det;
+ det_img = in_img;
det = in;
det_s = in_s;
}
int count = 0;
+ if(!prefix && !dont_show){
+ cvNamedWindow("Demo", CV_WINDOW_NORMAL);
+ cvMoveWindow("Demo", 0, 0);
+ cvResizeWindow("Demo", 1352, 1013);
+ }
+
+ CvVideoWriter* output_video_writer = NULL; // cv::VideoWriter output_video;
+ if (out_filename && !flag_exit)
+ {
+ CvSize size;
+ size.width = det_img->width, size.height = det_img->height;
+
+ //const char* output_name = "test_dnn_out.avi";
+ //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('H', '2', '6', '4'), 25, size, 1);
+ output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('D', 'I', 'V', 'X'), 25, size, 1);
+ //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'J', 'P', 'G'), 25, size, 1);
+ //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'P', '4', 'V'), 25, size, 1);
+ //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'P', '4', '2'), 25, size, 1);
+ //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('X', 'V', 'I', 'D'), 25, size, 1);
+ //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('W', 'M', 'V', '2'), 25, size, 1);
+ }
+
+ 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;
+ if(!prefix){
+ if (!dont_show) {
+ show_image_cv_ipl(show_img, "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);
+ }
- //show_image(disp, "COCO");
- char buff[256];
- sprintf(buff, "coco/coco_%05d", count);
- save_image(disp, buff);
+ // if you run it with param -http_port 8090 then open URL in your web-browser: http://localhost:8090
+ if (http_stream_port > 0 && show_img) {
+ //int port = 8090;
+ int port = http_stream_port;
+ int timeout = 200;
+ int jpeg_quality = 30; // 1 - 100
+ send_mjpeg(show_img, port, timeout, jpeg_quality);
+ }
- //free_image(disp);
- //cvWaitKey(10);
- //pthread_join(fetch_thread, 0);
- //pthread_join(detect_thread, 0);
+ // save video file
+ if (output_video_writer && show_img) {
+ cvWriteFrame(output_video_writer, show_img);
+ printf("\n cvWriteFrame \n");
+ }
- 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;
+ cvReleaseImage(&show_img);
+
+ pthread_join(fetch_thread, 0);
+ pthread_join(detect_thread, 0);
+
+ if (flag_exit == 1) break;
+
+ if(delay == 0){
+ free_image(disp);
+ disp = det;
+ show_img = det_img;
+ }
+ det_img = in_img;
+ det = in;
+ det_s = in_s;
+ }else {
+ fetch_in_thread(0);
+ det_img = in_img;
+ det = in;
+ det_s = in_s;
+ detect_in_thread(0);
+ if(delay == 0) {
+ free_image(disp);
+ disp = det;
+ }
+ if (!dont_show) {
+ show_image(disp, "Demo");
+ cvWaitKey(1);
+ }
+ }
+ --delay;
+ if(delay < 0){
+ delay = frame_skip;
+
+ double after = get_wall_time();
+ float curr = 1./(after - before);
+ fps = curr;
+ before = after;
+ }
}
+ printf("input video stream closed. \n");
+ if (output_video_writer) {
+ cvReleaseVideoWriter(&output_video_writer);
+ printf("output_video_writer closed. \n");
+ }
}
#else
-void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, image *labels, int classes, int frame_skip)
+void demo(char *cfgfile, char *weightfile, float thresh, float hier_thresh, int cam_index, const char *filename, char **names, int classes,
+ int frame_skip, char *prefix, char *out_filename, int http_stream_port, int dont_show)
{
fprintf(stderr, "Demo needs OpenCV for webcam images.\n");
}
--
Gitblit v1.10.0