From 3d2d0a7c98dbc8923d9ff705b81ff4f7940ea6ff Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Tue, 10 Jul 2018 22:24:17 +0000
Subject: [PATCH] Merge pull request #1172 from sberan/flush-stdout
---
src/demo.c | 252 +++++++++++++++++++++++++++++---------------------
1 files changed, 146 insertions(+), 106 deletions(-)
diff --git a/src/demo.c b/src/demo.c
index 9041c73..1b6b952 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,33 +49,40 @@
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");
- flag_exit = 1;
- return EXIT_FAILURE;
+ printf("Stream closed.\n");
+ flag_exit = 1;
+ return EXIT_FAILURE;
}
//in_s = resize_image(in, net.w, net.h);
-
+
return 0;
}
void *detect_in_thread(void *ptr)
{
- float nms = .45; // 0.4F
+ float nms = .45; // 0.4F
layer l = net.layers[net.n-1];
float *X = det_s.data;
@@ -85,38 +93,30 @@
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);
+
+ int nboxes = 0;
+ 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];
+ 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_detections(dets, nboxes);
- return 0;
+ 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;
}
double get_wall_time()
@@ -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,34 +138,40 @@
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
+ net = parse_network_cfg_custom(cfgfile, 1); // set batch=1
if(weightfile){
load_weights(&net, weightfile);
}
//set_batch_network(&net, 1);
- fuse_conv_batchnorm(net);
+ fuse_conv_batchnorm(net);
srand(2222222);
if(filename){
printf("video file: %s\n", filename);
-//#ifdef CV_VERSION_EPOCH // OpenCV 2.x
-// cap = cvCaptureFromFile(filename);
-//#else // OpenCV 3.x
- cpp_video_capture = 1;
- cap = get_capture_video_stream(filename);
+//#ifdef CV_VERSION_EPOCH // OpenCV 2.x
+// cap = cvCaptureFromFile(filename);
+//#else // OpenCV 3.x
+ cpp_video_capture = 1;
+ cap = get_capture_video_stream(filename);
//#endif
}else{
- printf("Webcam index: %d\n", cam_index);
-//#ifdef CV_VERSION_EPOCH // OpenCV 2.x
+ printf("Webcam index: %d\n", cam_index);
+//#ifdef CV_VERSION_EPOCH // OpenCV 2.x
// cap = cvCaptureFromCAM(cam_index);
-//#else // OpenCV 3.x
- cpp_video_capture = 1;
- cap = get_capture_webcam(cam_index);
+//#else // OpenCV 3.x
+ cpp_video_capture = 1;
+ cap = get_capture_webcam(cam_index);
//#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;
@@ -178,49 +184,51 @@
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;
+ flag_exit = 0;
pthread_t fetch_thread;
pthread_t detect_thread;
fetch_in_thread(0);
- det_img = in_img;
+ det_img = in_img;
det_s = in_s;
fetch_in_thread(0);
detect_in_thread(0);
- det_img = in_img;
+ det_img = in_img;
det_s = in_s;
for(j = 0; j < FRAMES/2; ++j){
fetch_in_thread(0);
detect_in_thread(0);
- det_img = in_img;
+ det_img = in_img;
det_s = in_s;
}
int count = 0;
if(!prefix && !dont_show){
- cvNamedWindow("Demo", CV_WINDOW_NORMAL);
+ 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;
+ 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;
+ 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);
- }
+ //const char* output_name = "test_dnn_out.avi";
+ //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();
@@ -231,61 +239,66 @@
if(pthread_create(&detect_thread, 0, detect_in_thread, 0)) error("Thread creation failed");
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;
- }
- }
+ 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 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);
}
- // 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);
- }
+ // 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);
+ }
- // save video file
- if (output_video_writer && show_img) {
- cvWriteFrame(output_video_writer, show_img);
- printf("\n cvWriteFrame \n");
- }
+ // save video file
+ if (output_video_writer && show_img) {
+ cvWriteFrame(output_video_writer, show_img);
+ printf("\n cvWriteFrame \n");
+ }
- cvReleaseImage(&show_img);
+ cvReleaseImage(&show_img);
pthread_join(fetch_thread, 0);
pthread_join(detect_thread, 0);
- if (flag_exit == 1) break;
+ if (flag_exit == 1) break;
if(delay == 0){
- show_img = det_img;
+ show_img = det_img;
}
- det_img = in_img;
+ det_img = in_img;
det_s = in_s;
}else {
fetch_in_thread(0);
- det_img = in_img;
+ det_img = in_img;
det_s = in_s;
detect_in_thread(0);
- show_img = det_img;
- if (!dont_show) {
- show_image_cv_ipl(show_img, "Demo");
- cvWaitKey(1);
- }
- cvReleaseImage(&show_img);
+ show_img = det_img;
+ if (!dont_show) {
+ show_image_cv_ipl(show_img, "Demo");
+ cvWaitKey(1);
+ }
+ cvReleaseImage(&show_img);
}
--delay;
if(delay < 0){
@@ -297,15 +310,42 @@
before = after;
}
}
- printf("input video stream closed. \n");
- if (output_video_writer) {
- cvReleaseVideoWriter(&output_video_writer);
- printf("output_video_writer closed. \n");
- }
+ printf("input video stream closed. \n");
+ if (output_video_writer) {
+ 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