apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added "--tcp_threads" argument for multi-threaded detections (on multiple ports)

Browse Source
This commit is contained in:
matlabbe
2015-11-30 00:27:57 -05:00
parent 164da72169
commit cff1d4eac7
12 changed files with 304 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/FindObject.cpp
+8 -7
View File
@@ -1250,10 +1250,6 @@ void FindObject::detect(const cv::Mat & image)
time.start();
DetectionInfo info;
this->detect(image, info);
if(info.objDetected_.size() > 0 || Settings::getGeneral_sendNoObjDetectedEvents())
{
Q_EMIT objectsFound(info);
}
if(info.objDetected_.size() > 1)
{
@@ -1275,9 +1271,14 @@ void FindObject::detect(const cv::Mat & image)
QTime::currentTime().toString("HH:mm:ss.zzz").toStdString().c_str(),
time.elapsed());
}
if(info.objDetected_.size() > 0 || Settings::getGeneral_sendNoObjDetectedEvents())
{
Q_EMIT objectsFound(info);
}
}
bool FindObject::detect(const cv::Mat & image, find_object::DetectionInfo & info)
bool FindObject::detect(const cv::Mat & image, find_object::DetectionInfo & info) const
{
QTime totalTime;
totalTime.start();
@@ -1348,7 +1349,7 @@ bool FindObject::detect(const cv::Mat & image, find_object::DetectionInfo & info
info.sceneWords_ = words;
}
for(QMap<int, ObjSignature*>::iterator iter=objects_.begin(); iter!=objects_.end(); ++iter)
for(QMap<int, ObjSignature*>::const_iterator iter=objects_.begin(); iter!=objects_.end(); ++iter)
{
info.matches_.insert(iter.key(), QMultiMap<int, int>());
}
@@ -1434,7 +1435,7 @@ bool FindObject::detect(const cv::Mat & image, find_object::DetectionInfo & info
}
else
{
QMap<int, int>::iterator iter = dataRange_.lowerBound(i);
QMap<int, int>::const_iterator iter = dataRange_.lowerBound(i);
int objectId = iter.value();
int fisrtObjectDescriptorIndex = (iter == dataRange_.begin())?0:(--iter).key()+1;
int objectDescriptorIndex = i - fisrtObjectDescriptorIndex;
src/TcpServer.cpp
+10
View File
@@ -80,6 +80,7 @@ void TcpServer::publishDetectionInfo(const DetectionInfo & info)
QList<QTcpSocket*> clients = this->findChildren<QTcpSocket*>();
if(clients.size())
{
UINFO("TCP server: Publish detected objects");
QByteArray block;
QDataStream out(&block, QIODevice::WriteOnly);
out.setVersion(QDataStream::Qt_4_0);
@@ -156,6 +157,15 @@ void TcpServer::readReceivedData()
UINFO("TCP service: Remove %d", id);
Q_EMIT removeObject(id);
}
else if(serviceType == kDetectObject)
{
std::vector<unsigned char> buf(blockSizes_[client->socketDescriptor()]);
in.readRawData((char*)buf.data(), blockSizes_[client->socketDescriptor()]-sizeof(quint32));
cv::Mat image = cv::imdecode(buf, cv::IMREAD_UNCHANGED);
UINFO("TCP service: Detect object");
Q_EMIT detectObject(image);
}
else
{
UERROR("Unknown service type called %d", serviceType);