From 4cf4a89f05c671041c217a724fc9b4b026eb9de9 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Fri, 01 Jun 2018 21:33:17 +0000
Subject: [PATCH] Minor fix
---
src/http_stream.cpp | 99 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 92 insertions(+), 7 deletions(-)
diff --git a/src/http_stream.cpp b/src/http_stream.cpp
index ca57728..1b65173 100644
--- a/src/http_stream.cpp
+++ b/src/http_stream.cpp
@@ -44,9 +44,16 @@
using std::endl;
#include "opencv2/opencv.hpp"
+#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui/highgui_c.h"
+#include "opencv2/imgproc/imgproc_c.h"
+#ifndef CV_VERSION_EPOCH
+#include "opencv2/videoio/videoio.hpp"
+#endif
using namespace cv;
#include "http_stream.h"
+#include "image.h"
class MJPGWriter
@@ -185,8 +192,7 @@
return true;
}
};
-
-
+// ----------------------------------------
void send_mjpeg(IplImage* ipl, int port, int timeout, int quality) {
static MJPGWriter wri(port, timeout, quality);
@@ -194,7 +200,19 @@
wri.write(mat);
std::cout << " MJPEG-stream sent. \n";
}
+// ----------------------------------------
+CvCapture* get_capture_video_stream(char *path) {
+ CvCapture* cap = NULL;
+ try {
+ cap = (CvCapture*)new cv::VideoCapture(path);
+ }
+ catch (...) {
+ std::cout << " Error: video-stream " << path << " can't be opened! \n";
+ }
+ return cap;
+}
+// ----------------------------------------
CvCapture* get_capture_webcam(int index) {
CvCapture* cap = NULL;
@@ -208,23 +226,90 @@
}
return cap;
}
+// ----------------------------------------
IplImage* get_webcam_frame(CvCapture *cap) {
IplImage* src = NULL;
try {
cv::VideoCapture &cpp_cap = *(cv::VideoCapture *)cap;
cv::Mat frame;
- if (cpp_cap.isOpened()) {
+ if (cpp_cap.isOpened())
+ {
cpp_cap >> frame;
- src = cvCreateImage(cvSize(frame.cols, frame.rows), 8, frame.channels());
- *src = frame;
+ IplImage tmp = frame;
+ src = cvCloneImage(&tmp);
+ }
+ else {
+ std::cout << " Video-stream stoped! \n";
}
}
catch (...) {
- std::cout << " Web-camera stoped! \n";
+ std::cout << " Video-stream stoped! \n";
}
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
+ if (ipl->nChannels >= 3)
+ {
+ 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
+ }
+ else
+ {
+ sized *= dexp;
+ }
+
+ // Mat -> IplImage -> image
+ IplImage src = sized;
+ image out = ipl_to_image(&src);
+
+ return out;
+}
-#endif // OPENCV
\ No newline at end of file
+#endif // OPENCV
--
Gitblit v1.10.0