From 5bc62b14e06a3fcfda4e3a19fba77589920eddee Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 03 Jul 2017 11:12:52 +0000
Subject: [PATCH] Memory leak fixed
---
src/demo.c | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/demo.c b/src/demo.c
index 19eaee1..3aec3a5 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -7,7 +7,10 @@
#include "box.h"
#include "image.h"
#include "demo.h"
-#include <sys/time.h>
+//#include <sys/time.h>
+#include <time.h>
+#include <winsock.h>
+#include "gettimeofday.h"
#define FRAMES 3
@@ -35,15 +38,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;
}
@@ -75,11 +89,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()
@@ -133,12 +150,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;
@@ -146,6 +165,7 @@
fetch_in_thread(0);
detect_in_thread(0);
disp = det;
+ det_img = in_img;
det = in;
det_s = in_s;
}
@@ -165,8 +185,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");
int c = cvWaitKey(1);
if (c == 10){
if(frame_skip == 0) frame_skip = 60;
@@ -186,11 +207,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);
--
Gitblit v1.10.0