ZF/OpenFace
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/ope/OpenFace.git synced 2026-08-03 08:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feature/opencv4 (#706)

Browse Source 
* Travis OpenCV4 update, testing Ubuntu with new OpenCV

* Fix to Ubuntu travis

* Another attempt at OpenCV 4.0 for Ubuntu

* And another OpenCV attempt.

* Simplifying the travis script

* Ubuntu OpenCV 4 support.

* Updating to OpenCV 4, for x64 windows.

* Fixes to move to OpenCV 4 on windows.

* Travis fix for OpenCV 4 on OSX

* Renaming a lib.

* Travis opencv4 fix.

* Building OpenCV4 versions using appveyor.

* Attempt mac travis fix.

* Small travis fix.

* Travis fix attempt.

* First iteration in boost removal and upgrade to C++17

* Test with ocv 4.0

* Moving filesystem out of stdafx

* Some more boost testing with cmake.

* More CMAKE options

* More compiler flag changes

* Another attempt at compiler options.

* Another attempt.

* More filesystem stuff.

* Linking to filesystem.

* Cmake fix with target linking.

* Attempting travis with g++-8

* Attempting to setup g++8 on travis linux.

* Another travis change.

* Adding OpenBLAS to travis and removing g++-8

* Fixing typo

* More travis experiments.

* More travis debugging.

* A small directory change.

* Adding some more travis changes.

* travis typo fix.

* Some reordering of travis, for cleaner yml

* Removing `using namespace std` in order to avoid clash with byte and to make the code more consistent.

* Working towards removing std::filesystem requirement, allow boost::filesystem as well.

* Making boost an optional dependency

* Fixing std issue.

* Fixing cmake issue.

* Fixing the precompiled header issue.

* Another cmake boost fix.

* Including missing files.

* Removing unnecessary includes.

* Removing more includes.

* Changes to appveyor build, proper removal of VS2015

* If boost is present, do not need to link to filesystem.

* Removing un-needed link library.

* oops

* Mac attempt at opencv4 travis.

* Upgrading OCV to 4.1 on VS2018

* Downloading OpenCV binaries through a script

* Triger an appveyor build.

* Upgrading VS version.

* Attempting VS2017 build

* Adding win-32 libraries for OpenCV 4.1

* Adding OpenCV 32 bit libraries.
This commit is contained in:
Tadas Baltrusaitis
2019-05-28 19:49:17 +01:00
committed by GitHub
parent 330383fef7
commit 9147dfe2f3
2762 changed files with 37401 additions and 353002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
View File

@@ -62,21 +62,19 @@ static void printErrorAndAbort(const std::string & error)
#define FATAL_STREAM( stream ) \
printErrorAndAbort( std::string( "Fatal error: " ) + stream )
using namespace std;
vector<string> get_arguments(int argc, char **argv)
std::vector<std::string> get_arguments(int argc, char **argv)
{
vector<string> arguments;
std::vector<std::string> arguments;
for (int i = 0; i < argc; ++i)
{
arguments.push_back(string(argv[i]));
arguments.push_back(std::string(argv[i]));
}
return arguments;
}
void NonOverlapingDetections(const vector<LandmarkDetector::CLNF>& clnf_models, vector<cv::Rect_<float> >& face_detections)
void NonOverlapingDetections(const std::vector<LandmarkDetector::CLNF>& clnf_models, std::vector<cv::Rect_<float> >& face_detections)
{
// Go over the model and eliminate detections that are not informative (there already is a tracker there)
@@ -103,13 +101,13 @@ void NonOverlapingDetections(const vector<LandmarkDetector::CLNF>& clnf_models,
int main(int argc, char **argv)
{
vector<string> arguments = get_arguments(argc, argv);
std::vector<std::string> arguments = get_arguments(argc, argv);
// no arguments: output usage
if (arguments.size() == 1)
{
cout << "For command line arguments see:" << endl;
cout << " https://github.com/TadasBaltrusaitis/OpenFace/wiki/Command-line-arguments";
std::cout << "For command line arguments see:" << std::endl;
std::cout << " https://github.com/TadasBaltrusaitis/OpenFace/wiki/Command-line-arguments";
return 0;
}
@@ -119,12 +117,12 @@ int main(int argc, char **argv)
det_params.curr_face_detector = LandmarkDetector::FaceModelParameters::MTCNN_DETECTOR;
vector<LandmarkDetector::FaceModelParameters> det_parameters;
std::vector<LandmarkDetector::FaceModelParameters> det_parameters;
det_parameters.push_back(det_params);
// The modules that are being used for tracking
vector<LandmarkDetector::CLNF> face_models;
vector<bool> active_models;
std::vector<LandmarkDetector::CLNF> face_models;
std::vector<bool> active_models;
int num_faces_max = 4;
@@ -132,7 +130,7 @@ int main(int argc, char **argv)
if (!face_model.loaded_successfully)
{
cout << "ERROR: Could not load the landmark detector" << endl;
std::cout << "ERROR: Could not load the landmark detector" << std::endl;
return 1;
}
@@ -145,7 +143,7 @@ int main(int argc, char **argv)
// If can't find MTCNN face detector, default to HOG one
if (det_parameters[0].curr_face_detector == LandmarkDetector::FaceModelParameters::MTCNN_DETECTOR && face_model.face_detector_MTCNN.empty())
{
cout << "INFO: defaulting to HOG-SVM face detector" << endl;
std::cout << "INFO: defaulting to HOG-SVM face detector" << std::endl;
det_parameters[0].curr_face_detector = LandmarkDetector::FaceModelParameters::HOG_SVM_DETECTOR;
}
@@ -168,12 +166,12 @@ int main(int argc, char **argv)
if (!face_model.eye_model)
{
cout << "WARNING: no eye model found" << endl;
std::cout << "WARNING: no eye model found" << std::endl;
}
if (face_analyser.GetAUClassNames().size() == 0 && face_analyser.GetAUClassNames().size() == 0)
{
cout << "WARNING: no Action Unit models found" << endl;
std::cout << "WARNING: no Action Unit models found" << std::endl;
}
// Open a sequence
@@ -232,7 +230,7 @@ int main(int argc, char **argv)
// Reading the images
cv::Mat_<uchar> grayscale_image = sequence_reader.GetGrayFrame();
vector<cv::Rect_<float> > face_detections;
std::vector<cv::Rect_<float> > face_detections;
bool all_models_active = true;
for (unsigned int model = 0; model < face_models.size(); ++model)
@@ -248,7 +246,7 @@ int main(int argc, char **argv)
{
if (det_parameters[0].curr_face_detector == LandmarkDetector::FaceModelParameters::HOG_SVM_DETECTOR)
{
vector<float> confidences;
std::vector<float> confidences;
LandmarkDetector::DetectFacesHOG(face_detections, grayscale_image, face_models[0].face_detector_HOG, confidences);
}
else if (det_parameters[0].curr_face_detector == LandmarkDetector::FaceModelParameters::HAAR_DETECTOR)
@@ -257,7 +255,7 @@ int main(int argc, char **argv)
}
else
{
vector<float> confidences;
std::vector<float> confidences;
LandmarkDetector::DetectFacesMTCNN(face_detections, rgb_image, face_models[0].face_detector_MTCNN, confidences);
}
@@ -402,10 +400,10 @@ int main(int argc, char **argv)
// Reporting progress
if (sequence_reader.GetProgress() >= reported_completion / 10.0)
{
cout << reported_completion * 10 << "% ";
std::cout << reported_completion * 10 << "% ";
if (reported_completion == 10)
{
cout << endl;
std::cout << std::endl;
}
reported_completion = reported_completion + 1;
}