dockerfile/openalpr-base
1
0
Fork 0
mirror of https://github.com/kerberos-io/openalpr-base.git synced 2025-10-07 06:50:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplified videobuffer usage by copying all the buffer data -- reduces chances of memory issues across threads.

Browse Source
This commit is contained in:
Matt Hill
2014-10-26 20:37:15 -04:00
parent 2e95b0dd9e
commit 9ccb8d7a8e
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/video/videobuffer.cpp
View File

@@ -149,10 +149,6 @@ void imageCollectionThread(void* arg)
// it returns so that the video capture can be recreated. // it returns so that the video capture can be recreated.
void getALPRImages(cv::VideoCapture cap, VideoDispatcher* dispatcher) void getALPRImages(cv::VideoCapture cap, VideoDispatcher* dispatcher)
{ {
cv::Mat frame1;
cv::Mat frame2;
cv::Mat* receiveframe;
bool receiveframeisframe1 = true;
while (dispatcher->active) while (dispatcher->active)
{ {
@@ -162,11 +158,10 @@ void getALPRImages(cv::VideoCapture cap, VideoDispatcher* dispatcher)
bool hasImage = false; bool hasImage = false;
try try
{ {
if (receiveframeisframe1) receiveframe = &frame1; cv::Mat frame;
else receiveframe = &frame2; hasImage = cap.read(frame);
hasImage = cap.read(*receiveframe);
// Double check the image to make sure it's valid. // Double check the image to make sure it's valid.
if (!(*receiveframe).data || (*receiveframe).empty()) if (!frame.data || frame.empty())
{ {
std::stringstream ss; std::stringstream ss;
ss << "Stream " << dispatcher->mjpeg_url << " received invalid frame"; ss << "Stream " << dispatcher->mjpeg_url << " received invalid frame";
@@ -175,9 +170,8 @@ void getALPRImages(cv::VideoCapture cap, VideoDispatcher* dispatcher)
} }
dispatcher->mMutex.lock(); dispatcher->mMutex.lock();
dispatcher->setLatestFrame(receiveframe); dispatcher->setLatestFrame(frame);
dispatcher->mMutex.unlock(); dispatcher->mMutex.unlock();
receiveframeisframe1 = !receiveframeisframe1;
} }
catch (const std::runtime_error& error) catch (const std::runtime_error& error)
{ {

13
src/video/videobuffer.h
View File

@@ -33,8 +33,8 @@ class VideoDispatcher
if (latestFrameNumber == lastFrameRead) if (latestFrameNumber == lastFrameRead)
return -1; return -1;
frame->create(latestFrame->size(), latestFrame->type()); frame->create(latestFrame.size(), latestFrame.type());
latestFrame->copyTo(*frame); latestFrame.copyTo(*frame);
this->lastFrameRead = this->latestFrameNumber; this->lastFrameRead = this->latestFrameNumber;
@@ -45,11 +45,10 @@ class VideoDispatcher
return this->lastFrameRead; return this->lastFrameRead;
} }
void setLatestFrame(cv::Mat* frame) void setLatestFrame(cv::Mat frame)
{ {
//tthread::lock_guard<tthread::mutex> guard(mMutex); frame.copyTo(this->latestFrame);
this->latestFrame = frame; this->latestRegionsOfInterest = calculateRegionsOfInterest(&this->latestFrame);
this->latestRegionsOfInterest = calculateRegionsOfInterest(frame);
this->latestFrameNumber++; this->latestFrameNumber++;
} }
@@ -83,7 +82,7 @@ class VideoDispatcher
tthread::mutex mMutex; tthread::mutex mMutex;
private: private:
cv::Mat* latestFrame; cv::Mat latestFrame;
std::vector<cv::Rect> latestRegionsOfInterest; std::vector<cv::Rect> latestRegionsOfInterest;
}; };