From 8a504c737d2bc3b9b37cb79cb50fbf7eecda07df Mon Sep 17 00:00:00 2001
From: Tino Hager <tino.hager@nager.at>
Date: Wed, 27 Jun 2018 21:56:47 +0000
Subject: [PATCH] repair tabs spaces
---
src/demo.c | 104 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 72 insertions(+), 32 deletions(-)
diff --git a/src/demo.c b/src/demo.c
index 9041c73..34627ce 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -40,6 +40,7 @@
static int cpp_video_capture = 0;
static float fps = 0;
static float demo_thresh = 0;
+static int demo_ext_output = 0;
static float *predictions[FRAMES];
static int demo_index = 0;
@@ -48,19 +49,26 @@
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 draw_detections_cv_v3(IplImage* show_img, detection *dets, int num, float thresh, char **names, image **alphabet, int classes, int ext_output);
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 cpp_video_capture);
+image get_image_from_stream_resize(CvCapture *cap, int w, int h, int c, IplImage** in_img, int cpp_video_capture, int dont_close);
+image get_image_from_stream_letterbox(CvCapture *cap, int w, int h, int c, IplImage** in_img, int cpp_video_capture, int dont_close);
+int get_stream_fps(CvCapture *cap, int cpp_video_capture);
IplImage* in_img;
IplImage* det_img;
IplImage* show_img;
static int flag_exit;
+static int letter_box = 0;
void *fetch_in_thread(void *ptr)
{
//in = get_image_from_stream(cap);
- in_s = get_image_from_stream_resize(cap, net.w, net.h, &in_img, cpp_video_capture);
+ int dont_close_stream = 0; // set 1 if your IP-camera periodically turns off and turns on video-stream
+ if(letter_box)
+ in_s = get_image_from_stream_letterbox(cap, net.w, net.h, net.c, &in_img, cpp_video_capture, dont_close_stream);
+ else
+ in_s = get_image_from_stream_resize(cap, net.w, net.h, net.c, &in_img, cpp_video_capture, dont_close_stream);
if(!in_s.data){
//error("Stream closed.");
printf("Stream closed.\n");
@@ -85,35 +93,27 @@
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){
- 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_s.w, det_s.h, demo_thresh, demo_thresh, 0, 1, &nboxes, letter);
- if (nms) do_nms_obj(dets, nboxes, l.classes, nms);
+ detection *dets = NULL;
+ if (letter_box)
+ dets = get_network_boxes(&net, in_img->width, in_img->height, demo_thresh, demo_thresh, 0, 1, &nboxes, 1); // letter box
+ else
+ dets = get_network_boxes(&net, det_s.w, det_s.h, demo_thresh, demo_thresh, 0, 1, &nboxes, 0); // resized
+ //if (nms) do_nms_obj(dets, nboxes, l.classes, nms); // bad results
+ if (nms) do_nms_sort(dets, nboxes, l.classes, nms);
+
printf("\033[2J");
printf("\033[1;1H");
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);
+ draw_detections_cv_v3(det_img, dets, nboxes, demo_thresh, demo_names, demo_alphabet, demo_classes, demo_ext_output);
free_detections(dets, nboxes);
return 0;
@@ -129,7 +129,7 @@
}
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)
+ int frame_skip, char *prefix, char *out_filename, int http_stream_port, int dont_show, int ext_output)
{
//skip = frame_skip;
image **alphabet = load_alphabet();
@@ -138,6 +138,7 @@
demo_alphabet = alphabet;
demo_classes = classes;
demo_thresh = thresh;
+ demo_ext_output = ext_output;
printf("Demo\n");
net = parse_network_cfg_custom(cfgfile, 1); // set batch=1
if(weightfile){
@@ -165,7 +166,12 @@
//#endif
}
- if(!cap) error("Couldn't connect to webcam.\n");
+ if (!cap) {
+#ifdef WIN32
+ printf("Check that you have copied file opencv_ffmpeg340_64.dll to the same directory where is darknet.exe \n");
+#endif
+ error("Couldn't connect to webcam.\n");
+ }
layer l = net.layers[net.n-1];
int j;
@@ -211,15 +217,17 @@
{
CvSize size;
size.width = det_img->width, size.height = det_img->height;
+ int src_fps = 25;
+ src_fps = get_stream_fps(cap, cpp_video_capture);
//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);
+ //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('H', '2', '6', '4'), src_fps, size, 1);
+ output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('D', 'I', 'V', 'X'), src_fps, size, 1);
+ //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'J', 'P', 'G'), src_fps, size, 1);
+ //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'P', '4', 'V'), src_fps, size, 1);
+ //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'P', '4', '2'), src_fps, size, 1);
+ //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('X', 'V', 'I', 'D'), src_fps, size, 1);
+ //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('W', 'M', 'V', '2'), src_fps, size, 1);
}
double before = get_wall_time();
@@ -240,10 +248,15 @@
else if (frame_skip == 60) frame_skip = 4;
else frame_skip = 0;
}
+ else if (c == 27 || c == 1048603) // ESC - exit (OpenCV 2.x / 3.x)
+ {
+ flag_exit = 1;
+ }
}
}else{
char buff[256];
- sprintf(buff, "%s_%08d", prefix, count);
+ sprintf(buff, "%s_%08d.jpg", prefix, count);
+ cvSaveImage(buff, show_img, 0);
//save_image(disp, buff);
}
@@ -302,10 +315,37 @@
cvReleaseVideoWriter(&output_video_writer);
printf("output_video_writer closed. \n");
}
+
+ // free memory
+ cvReleaseImage(&show_img);
+ cvReleaseImage(&in_img);
+ free_image(in_s);
+
+ free(avg);
+ for (j = 0; j < FRAMES; ++j) free(predictions[j]);
+ for (j = 0; j < FRAMES; ++j) free_image(images[j]);
+
+ for (j = 0; j < l.w*l.h*l.n; ++j) free(probs[j]);
+ free(boxes);
+ free(probs);
+
+ free_ptrs(names, net.layers[net.n - 1].classes);
+
+ int i;
+ const int nsize = 8;
+ for (j = 0; j < nsize; ++j) {
+ for (i = 32; i < 127; ++i) {
+ free_image(alphabet[j][i]);
+ }
+ free(alphabet[j]);
+ }
+ free(alphabet);
+
+ free_network(net);
}
#else
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)
+ int frame_skip, char *prefix, char *out_filename, int http_stream_port, int dont_show, int ext_output)
{
fprintf(stderr, "Demo needs OpenCV for webcam images.\n");
}
--
Gitblit v1.10.0