From 1b5afb45838e603fa6780762eb8cc59246dc2d81 Mon Sep 17 00:00:00 2001
From: IlyaOvodov <b@ovdv.ru>
Date: Tue, 08 May 2018 11:09:35 +0000
Subject: [PATCH] Output improvements for detector results: When printing detector results, output was done in random order, obfuscating results for interpreting. Now: 1. Text output includes coordinates of rects in (left,right,top,bottom in pixels) along with label and score 2. Text output is sorted by rect lefts to simplify finding appropriate rects on image 3. If several class probs are > thresh for some detection, the most probable is written first and coordinates for others are not repeated 4. Rects are imprinted in image in order by their best class prob, so most probable rects are always on top and not overlayed by less probable ones 5. Most probable label for rect is always written first Also: 6. Message about low GPU memory include required amount
---
src/http_stream.cpp | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/src/http_stream.cpp b/src/http_stream.cpp
index ca57728..5ae8f78 100644
--- a/src/http_stream.cpp
+++ b/src/http_stream.cpp
@@ -47,6 +47,7 @@
using namespace cv;
#include "http_stream.h"
+#include "image.h"
class MJPGWriter
@@ -185,8 +186,7 @@
return true;
}
};
-
-
+// ----------------------------------------
void send_mjpeg(IplImage* ipl, int port, int timeout, int quality) {
static MJPGWriter wri(port, timeout, quality);
@@ -194,7 +194,7 @@
wri.write(mat);
std::cout << " MJPEG-stream sent. \n";
}
-
+// ----------------------------------------
CvCapture* get_capture_webcam(int index) {
CvCapture* cap = NULL;
@@ -208,6 +208,7 @@
}
return cap;
}
+// ----------------------------------------
IplImage* get_webcam_frame(CvCapture *cap) {
IplImage* src = NULL;
@@ -225,6 +226,61 @@
}
return src;
}
+// ----------------------------------------
+extern "C" {
+ image ipl_to_image(IplImage* src); // image.c
+}
+
+image image_data_augmentation(IplImage* ipl, int w, int h,
+ int pleft, int ptop, int swidth, int sheight, int flip,
+ float jitter, float dhue, float dsat, float dexp)
+{
+ cv::Mat img = cv::cvarrToMat(ipl);
+
+ // crop
+ cv::Rect src_rect(pleft, ptop, swidth, sheight);
+ cv::Rect img_rect(cv::Point2i(0, 0), img.size());
+ cv::Rect new_src_rect = src_rect & img_rect;
+
+ cv::Rect dst_rect(cv::Point2i(std::max(0, -pleft), std::max(0, -ptop)), new_src_rect.size());
+
+ cv::Mat cropped(cv::Size(src_rect.width, src_rect.height), img.type());
+ cropped.setTo(cv::Scalar::all(0));
+
+ img(new_src_rect).copyTo(cropped(dst_rect));
+
+ // resize
+ cv::Mat sized;
+ cv::resize(cropped, sized, cv::Size(w, h), 0, 0, INTER_LINEAR);
+
+ // flip
+ if (flip) {
+ cv::flip(sized, cropped, 1); // 0 - x-axis, 1 - y-axis, -1 - both axes (x & y)
+ sized = cropped.clone();
+ }
+
+ // HSV augmentation
+ // CV_BGR2HSV, CV_RGB2HSV, CV_HSV2BGR, CV_HSV2RGB
+ cv::Mat hsv_src;
+ cvtColor(sized, hsv_src, CV_BGR2HSV); // also BGR -> RGB
+
+ std::vector<cv::Mat> hsv;
+ cv::split(hsv_src, hsv);
+
+ hsv[1] *= dsat;
+ hsv[2] *= dexp;
+ hsv[0] += 179 * dhue;
+
+ cv::merge(hsv, hsv_src);
+
+ cvtColor(hsv_src, sized, CV_HSV2RGB); // now RGB instead of BGR
+
+ // Mat -> IplImage -> image
+ IplImage src = sized;
+ image out = ipl_to_image(&src);
+
+ return out;
+}
#endif // OPENCV
\ No newline at end of file
--
Gitblit v1.10.0