Update demo.cpp

Added HTTP stream over multi-client MJPEG  sever, added ESC Key quit and resizable cv window
This commit is contained in:
Biparnak Roy
2020-07-18 05:06:22 +05:30
committed by GitHub
parent f4970d1e6f
commit d957d9af07
+35 -13
View File
@@ -3,6 +3,7 @@
#include <stdlib.h> /* srand, rand */ #include <stdlib.h> /* srand, rand */
#include <unistd.h> #include <unistd.h>
#include <mutex> #include <mutex>
#include <https_stream.h> //https_stream
#include "CenternetDetection.h" #include "CenternetDetection.h"
#include "MobilenetDetection.h" #include "MobilenetDetection.h"
@@ -11,17 +12,18 @@
bool gRun; bool gRun;
bool SAVE_RESULT = false; bool SAVE_RESULT = false;
void sig_handler(int signo) { void sig_handler(int signo)
{
std::cout << "request gateway stop\n"; std::cout << "request gateway stop\n";
gRun = false; gRun = false;
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[])
{
std::cout << "detection\n"; std::cout << "detection\n";
signal(SIGINT, sig_handler); signal(SIGINT, sig_handler);
std::string net = "yolo3_berkeley.rt"; std::string net = "yolo3_berkeley.rt";
if (argc > 1) if (argc > 1)
net = argv[1]; net = argv[1];
@@ -40,6 +42,9 @@ int main(int argc, char *argv[]) {
bool show = true; bool show = true;
if (argc > 6) if (argc > 6)
show = atoi(argv[6]); show = atoi(argv[6]);
int port = 0;
if (argc > 7)
port = atoi(argv[7]);
if (n_batch < 1 || n_batch > 64) if (n_batch < 1 || n_batch > 64)
FatalError("Batch dim not supported"); FatalError("Batch dim not supported");
@@ -80,7 +85,8 @@ int main(int argc, char *argv[]) {
std::cout << "camera started\n"; std::cout << "camera started\n";
cv::VideoWriter resultVideo; cv::VideoWriter resultVideo;
if(SAVE_RESULT) { if (SAVE_RESULT)
{
int w = cap.get(cv::CAP_PROP_FRAME_WIDTH); int w = cap.get(cv::CAP_PROP_FRAME_WIDTH);
int h = cap.get(cv::CAP_PROP_FRAME_HEIGHT); int h = cap.get(cv::CAP_PROP_FRAME_HEIGHT);
resultVideo.open("result.mp4", cv::VideoWriter::fourcc('M', 'P', '4', 'V'), 30, cv::Size(w, h)); resultVideo.open("result.mp4", cv::VideoWriter::fourcc('M', 'P', '4', 'V'), 30, cv::Size(w, h));
@@ -89,15 +95,19 @@ int main(int argc, char *argv[]) {
cv::Mat frame; cv::Mat frame;
if (show) if (show)
cv::namedWindow("detection", cv::WINDOW_NORMAL); cv::namedWindow("detection", cv::WINDOW_NORMAL);
cv::moveWindow("detection", 0, 0);
cv::resizeWindow("detection", 1352, 1013);
std::vector<cv::Mat> batch_frame; std::vector<cv::Mat> batch_frame;
std::vector<cv::Mat> batch_dnn_input; std::vector<cv::Mat> batch_dnn_input;
while(gRun) { while (gRun)
{
batch_dnn_input.clear(); batch_dnn_input.clear();
batch_frame.clear(); batch_frame.clear();
for(int bi=0; bi< n_batch; ++bi){ for (int bi = 0; bi < n_batch; ++bi)
{
cap >> frame; cap >> frame;
if (!frame.data) if (!frame.data)
break; break;
@@ -114,14 +124,25 @@ int main(int argc, char *argv[]) {
detNN->update(batch_dnn_input, n_batch); detNN->update(batch_dnn_input, n_batch);
detNN->draw(batch_frame); detNN->draw(batch_frame);
if(show){ if (show)
for(int bi=0; bi< n_batch; ++bi){ {
for (int bi = 0; bi < n_batch; ++bi)
{
cv::imshow("detection", batch_frame[bi]); cv::imshow("detection", batch_frame[bi]);
cv::waitKey(1);
} }
} }
if (cv::waitKey(1) == 27)
{
break;
}
if (n_batch == 1 && SAVE_RESULT) if (n_batch == 1 && SAVE_RESULT)
resultVideo << frame; resultVideo << frame;
if (port > 0)
{
send_mjpeg(batch_frame[0], port, 400000, 40);
}
} }
std::cout << "detection end\n"; std::cout << "detection end\n";
@@ -130,10 +151,11 @@ int main(int argc, char *argv[]) {
std::cout << COL_GREENB << "\n\nTime stats:\n"; std::cout << COL_GREENB << "\n\nTime stats:\n";
std::cout << "Min: " << *std::min_element(detNN->stats.begin(), detNN->stats.end()) / n_batch << " ms\n"; std::cout << "Min: " << *std::min_element(detNN->stats.begin(), detNN->stats.end()) / n_batch << " ms\n";
std::cout << "Max: " << *std::max_element(detNN->stats.begin(), detNN->stats.end()) / n_batch << " ms\n"; std::cout << "Max: " << *std::max_element(detNN->stats.begin(), detNN->stats.end()) / n_batch << " ms\n";
for(int i=0; i<detNN->stats.size(); i++) mean += detNN->stats[i]; mean /= detNN->stats.size(); for (int i = 0; i < detNN->stats.size(); i++)
std::cout<<"Avg: "<<mean/n_batch<<" ms\t"<<1000/(mean/n_batch)<<" FPS\n"<<COL_END; mean += detNN->stats[i];
mean /= detNN->stats.size();
std::cout << "Avg: " << mean / n_batch << " ms\t" << 1000 / (mean / n_batch) << " FPS\n"
<< COL_END;
return 0; return 0;
} }