mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

Latency fix for RTSP-camera in console-app

Browse Source
This commit is contained in:
AlexeyAB
2017-08-08 02:57:56 +03:00
parent 4579b589ba
commit b202eaee25
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/darknet/yolo_console_dll.vcxproj
View File

@ -117,6 +117,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>C:\opencv_3.0\opencv\build\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>C:\opencv_3.0\opencv\build\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>

12
src/yolo_console_dll.cpp
View File

@ -4,6 +4,7 @@
#include <vector> #include <vector>
#include <fstream> #include <fstream>
#include <thread> #include <thread>
#include <atomic>
#define OPENCV #define OPENCV
@ -77,16 +78,19 @@ int main()
try { try {
#ifdef OPENCV #ifdef OPENCV
std::string const file_ext = filename.substr(filename.find_last_of(".") + 1); std::string const file_ext = filename.substr(filename.find_last_of(".") + 1);
if (file_ext == "avi" || file_ext == "mp4" || file_ext == "mjpg" || file_ext == "mov") { // video file std::string const protocol = filename.substr(0, 4);
if (file_ext == "avi" || file_ext == "mp4" || file_ext == "mjpg" || file_ext == "mov" || protocol == "rtsp") { // video file
cv::Mat frame, prev_frame, det_frame; cv::Mat frame, prev_frame, det_frame;
std::vector<bbox_t> result_vec, thread_result_vec; std::vector<bbox_t> result_vec, thread_result_vec;
detector.nms = 0.02; // comment it - if track_id is not required detector.nms = 0.02; // comment it - if track_id is not required
std::thread td([]() {}); std::thread td([]() {});
for (cv::VideoCapture cap(filename); cap >> frame, cap.isOpened();) { std::atomic<int> ready_flag = false;
cv::VideoCapture cap(filename);
for (; cap >> frame, cap.isOpened();) {
td.join(); td.join();
result_vec = thread_result_vec; result_vec = thread_result_vec;
det_frame = frame; det_frame = frame;
td = std::thread([&]() { thread_result_vec = detector.detect(det_frame, 0.2, true); }); td = std::thread([&]() { thread_result_vec = detector.detect(det_frame, 0.2, true); ready_flag = true; });
if (!prev_frame.empty()) { if (!prev_frame.empty()) {
result_vec = detector.tracking(result_vec); // comment it - if track_id is not required result_vec = detector.tracking(result_vec); // comment it - if track_id is not required
@ -94,6 +98,8 @@ int main()
show_result(result_vec, obj_names); show_result(result_vec, obj_names);
} }
prev_frame = frame; prev_frame = frame;
//if(protocol == "rtsp") while (!ready_flag) cap.grab(); // use if cam-fps 2x or more than dnn-fps
ready_flag = false;
} }
} }
else if (file_ext == "txt") { // list of image files else if (file_ext == "txt") { // list of image files