From 033e934ce82826c73d851098baf7ce4b1a27c89a Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 21 Feb 2018 16:14:01 +0000
Subject: [PATCH] If there is excessive GPU-RAM consumption by CUDNN then then do not use Workspace
---
src/image.c | 98 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 88 insertions(+), 10 deletions(-)
diff --git a/src/image.c b/src/image.c
index 35bd8a0..efa7185 100644
--- a/src/image.c
+++ b/src/image.c
@@ -14,12 +14,14 @@
#include "opencv2/highgui/highgui_c.h"
#include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/core/version.hpp"
+#include "http_stream.h"
#ifndef CV_VERSION_EPOCH
#include "opencv2/videoio/videoio_c.h"
+#include "opencv2/imgcodecs/imgcodecs_c.h"
+#include "http_stream.h"
#endif
#endif
-
int windows = 0;
float colors[6][3] = { {1,0,1}, {0,0,1},{0,1,1},{0,1,0},{1,1,0},{1,0,0} };
@@ -190,6 +192,14 @@
float prob = probs[i][class];
if(prob > thresh){
+ //// for comparison with OpenCV version of DNN Darknet Yolo v2
+ //printf("\n %f, %f, %f, %f, ", boxes[i].x, boxes[i].y, boxes[i].w, boxes[i].h);
+ // int k;
+ //for (k = 0; k < classes; ++k) {
+ // printf("%f, ", probs[i][k]);
+ //}
+ //printf("\n");
+
int width = im.h * .012;
if(0){
@@ -289,7 +299,7 @@
color.val[2] = blue * 256;
cvRectangle(show_img, pt1, pt2, color, width, 8, 0);
-
+ //printf("left=%d, right=%d, top=%d, bottom=%d, obj_id=%d, obj=%s \n", left, right, top, bot, class, names[class]);
cvRectangle(show_img, pt_text_bg1, pt_text_bg2, color, width, 8, 0);
cvRectangle(show_img, pt_text_bg1, pt_text_bg2, color, CV_FILLED, 8, 0); // filled
CvScalar black_color;
@@ -518,7 +528,7 @@
}
-void show_image_cv_ipl(IplImage *disp, const char *name)
+void show_image_cv_ipl(IplImage *disp, const char *name, const char *out_filename, int http_stream_port)
{
if (disp == NULL) return;
char buff[256];
@@ -530,6 +540,18 @@
cvShowImage(buff, disp);
+ // http mjpeg stream: http://localhost:8090
+ // use URL with the port number stated in your command line instead of 8090
+ if (http_stream_port > 0) {
+ //int port = 8090;
+ int port = http_stream_port;
+ int timeout = 200;
+ int jpeg_quality = 30; // 1 - 100
+ send_mjpeg(disp, port, timeout, jpeg_quality);
+ }
+
+
+ if(out_filename)
{
CvSize size;
{
@@ -539,10 +561,14 @@
static CvVideoWriter* output_video = NULL; // cv::VideoWriter output_video;
if (output_video == NULL)
{
- const char* output_name = "test_dnn_out.avi";
- //output_video = cvCreateVideoWriter(output_name, CV_FOURCC('H', '2', '6', '4'), 25, size, 1);
- output_video = cvCreateVideoWriter(output_name, CV_FOURCC('D', 'I', 'V', 'X'), 25, size, 1);
- //output_video = cvCreateVideoWriter(output_name, CV_FOURCC('M', 'J', 'P', 'G'), 25, size, 1);
+ //const char* output_name = "test_dnn_out.avi";
+ //output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('H', '2', '6', '4'), 25, size, 1);
+ output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('D', 'I', 'V', 'X'), 25, size, 1);
+ //output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'J', 'P', 'G'), 25, size, 1);
+ //output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'P', '4', 'V'), 25, size, 1);
+ //output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'P', '4', '2'), 25, size, 1);
+ //output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('X', 'V', 'I', 'D'), 25, size, 1);
+ //output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('W', 'M', 'V', '2'), 25, size, 1);
}
cvWriteFrame(output_video, disp); // comment this line to improve FPS !!!
@@ -879,6 +905,51 @@
#endif
}
+void fill_image(image m, float s)
+{
+ int i;
+ for (i = 0; i < m.h*m.w*m.c; ++i) m.data[i] = s;
+}
+
+void letterbox_image_into(image im, int w, int h, image boxed)
+{
+ int new_w = im.w;
+ int new_h = im.h;
+ if (((float)w / im.w) < ((float)h / im.h)) {
+ new_w = w;
+ new_h = (im.h * w) / im.w;
+ }
+ else {
+ new_h = h;
+ new_w = (im.w * h) / im.h;
+ }
+ image resized = resize_image(im, new_w, new_h);
+ embed_image(resized, boxed, (w - new_w) / 2, (h - new_h) / 2);
+ free_image(resized);
+}
+
+image letterbox_image(image im, int w, int h)
+{
+ int new_w = im.w;
+ int new_h = im.h;
+ if (((float)w / im.w) < ((float)h / im.h)) {
+ new_w = w;
+ new_h = (im.h * w) / im.w;
+ }
+ else {
+ new_h = h;
+ new_w = (im.w * h) / im.h;
+ }
+ image resized = resize_image(im, new_w, new_h);
+ image boxed = make_image(w, h, im.c);
+ fill_image(boxed, .5);
+ //int i;
+ //for(i = 0; i < boxed.w*boxed.h*boxed.c; ++i) boxed.data[i] = 0;
+ embed_image(resized, boxed, (w - new_w) / 2, (h - new_h) / 2);
+ free_image(resized);
+ return boxed;
+}
+
image resize_max(image im, int max)
{
int w = im.w;
@@ -1153,7 +1224,7 @@
void random_distort_image(image im, float hue, float saturation, float exposure)
{
- float dhue = rand_uniform(-hue, hue);
+ float dhue = rand_uniform_strong(-hue, hue);
float dsat = rand_scale(saturation);
float dexp = rand_scale(exposure);
distort_image(im, dhue, dsat, dexp);
@@ -1305,9 +1376,16 @@
image load_image(char *filename, int w, int h, int c)
{
#ifdef OPENCV
- image out = load_image_cv(filename, c);
+
+#ifndef CV_VERSION_EPOCH
+ //image out = load_image_stb(filename, c); // OpenCV 3.x
+ image out = load_image_cv(filename, c);
#else
- image out = load_image_stb(filename, c);
+ image out = load_image_cv(filename, c); // OpenCV 2.4.x
+#endif
+
+#else
+ image out = load_image_stb(filename, c); // without OpenCV
#endif
if((h && w) && (h != out.h || w != out.w)){
--
Gitblit v1.10.0