From 2ce6460c79e06caa33eab3991ee3e7fd9f0909d6 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Tue, 10 Apr 2018 18:08:24 +0000
Subject: [PATCH] Remove truth only if smaller than 1x1 pix during training
---
src/demo.c | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/src/demo.c b/src/demo.c
index 0dce144..027ca4d 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -24,6 +24,7 @@
#ifndef CV_VERSION_EPOCH
#include "opencv2/videoio/videoio_c.h"
#endif
+#include "http_stream.h"
image get_image_from_stream(CvCapture *cap);
static char **demo_names;
@@ -39,6 +40,7 @@
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;
@@ -49,8 +51,9 @@
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);
+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;
@@ -60,11 +63,12 @@
void *fetch_in_thread(void *ptr)
{
//in = get_image_from_stream(cap);
- in = get_image_from_stream_resize(cap, net.w, net.h, &in_img);
+ in = get_image_from_stream_resize(cap, net.w, net.h, &in_img, use_webcam);
if(!in.data){
//error("Stream closed.");
+ printf("Stream closed.\n");
flag_exit = 1;
- return;
+ return EXIT_FAILURE;
}
//in_s = resize_image(in, net.w, net.h);
in_s = make_image(in.w, in.h, in.c);
@@ -75,7 +79,7 @@
void *detect_in_thread(void *ptr)
{
- float nms = .4;
+ float nms = .45; // 0.4F
layer l = net.layers[net.n-1];
float *X = det_s.data;
@@ -86,6 +90,7 @@
l.output = avg;
free_image(det_s);
+ /*
if(l.type == DETECTION){
get_detection_boxes(l, 1, 1, demo_thresh, probs, boxes, 0);
} else if (l.type == REGION){
@@ -94,6 +99,12 @@
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:%.1f\n",fps);
@@ -106,7 +117,9 @@
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(det_img, 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);
return 0;
}
@@ -120,7 +133,7 @@
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, int classes,
+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;
@@ -136,14 +149,20 @@
load_weights(&net, weightfile);
}
set_batch_network(&net, 1);
-
+ fuse_conv_batchnorm(net);
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");
@@ -159,6 +178,8 @@
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 *));
+ flag_exit = 0;
+
pthread_t fetch_thread;
pthread_t detect_thread;
@@ -191,7 +212,7 @@
}
CvVideoWriter* output_video_writer = NULL; // cv::VideoWriter output_video;
- if (out_filename)
+ if (out_filename && !flag_exit)
{
CvSize size;
size.width = det_img->width, size.height = det_img->height;
@@ -205,7 +226,6 @@
//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);
}
- flag_exit = 0;
double before = get_wall_time();
@@ -233,7 +253,7 @@
}
// if you run it with param -http_port 8090 then open URL in your web-browser: http://localhost:8090
- if (http_stream_port > 0) {
+ if (http_stream_port > 0 && show_img) {
//int port = 8090;
int port = http_stream_port;
int timeout = 200;
@@ -242,10 +262,11 @@
}
// save video file
- if (output_video_writer) {
+ if (output_video_writer && show_img) {
cvWriteFrame(output_video_writer, show_img);
printf("\n cvWriteFrame \n");
}
+
cvReleaseImage(&show_img);
pthread_join(fetch_thread, 0);
@@ -293,7 +314,8 @@
}
}
#else
-void demo(char *cfgfile, char *weightfile, float 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)
+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