From 84d6533cb8112f23a34d3de76435a10f4620f4b8 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 23 Oct 2017 13:43:03 +0000
Subject: [PATCH] Fixed OpenCV usage in the yolo_console_dll.cpp
---
src/demo.c | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/src/demo.c b/src/demo.c
index 91562c0..c88c1d9 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -7,13 +7,23 @@
#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 3
#ifdef OPENCV
#include "opencv2/highgui/highgui_c.h"
#include "opencv2/imgproc/imgproc_c.h"
+#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;
@@ -35,15 +45,26 @@
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);
+image get_image_from_stream_resize(CvCapture *cap, int w, int h, IplImage** in_img);
+IplImage* in_img;
+IplImage* det_img;
+IplImage* show_img;
+
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);
if(!in.data){
error("Stream closed.");
}
- in_s = resize_image(in, net.w, net.h);
+ //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;
}
@@ -63,7 +84,7 @@
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);
+ get_region_boxes(l, 1, 1, demo_thresh, probs, boxes, 0, 0);
} else {
error("Last layer must produce detections\n");
}
@@ -75,11 +96,14 @@
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(det_img, l.w*l.h*l.n, demo_thresh, boxes, probs, demo_names, demo_alphabet, demo_classes);
- draw_detections(det, l.w*l.h*l.n, demo_thresh, boxes, probs, demo_names, demo_alphabet, demo_classes);
-
- return 0;
+ return 0;
}
double get_wall_time()
@@ -91,7 +115,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, int frame_skip, char *prefix)
+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)
{
//skip = frame_skip;
image **alphabet = load_alphabet();
@@ -110,6 +134,7 @@
srand(2222222);
if(filename){
+ printf("video file: %s\n", filename);
cap = cvCaptureFromFile(filename);
}else{
cap = cvCaptureFromCAM(cam_index);
@@ -132,12 +157,14 @@
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;
@@ -145,6 +172,7 @@
fetch_in_thread(0);
detect_in_thread(0);
disp = det;
+ det_img = in_img;
det = in;
det_s = in_s;
}
@@ -164,8 +192,9 @@
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");
- if(!prefix){
- show_image(disp, "Demo");
+ if(!prefix){
+ //show_image(disp, "Demo");
+ show_image_cv_ipl(show_img, "Demo", out_filename);
int c = cvWaitKey(1);
if (c == 10){
if(frame_skip == 0) frame_skip = 60;
@@ -185,11 +214,14 @@
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);
@@ -212,7 +244,7 @@
}
}
#else
-void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, int classes, int frame_skip, char *prefix)
+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)
{
fprintf(stderr, "Demo needs OpenCV for webcam images.\n");
}
--
Gitblit v1.10.0