From e4ab47dfcedb4c87e5eddf484caa4ac0c020fc9b Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 21 Feb 2018 12:35:09 +0000
Subject: [PATCH] Optimized resizing of region_layer for random=1
---
src/image.c | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/image.c b/src/image.c
index 75364e1..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, const char *out_filename)
+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];
@@ -529,6 +539,18 @@
++windows;
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;
@@ -1356,8 +1378,8 @@
#ifdef OPENCV
#ifndef CV_VERSION_EPOCH
- image out = load_image_stb(filename, c); // OpenCV 3.x
- //image out = load_image_cv(filename, c);
+ //image out = load_image_stb(filename, c); // OpenCV 3.x
+ image out = load_image_cv(filename, c);
#else
image out = load_image_cv(filename, c); // OpenCV 2.4.x
#endif
--
Gitblit v1.10.0