Commit Graph

46 Commits

Author SHA1 Message Date
Tadas Baltrusaitis
9147dfe2f3 Feature/opencv4 (#706)
* 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.
2019-05-28 19:49:17 +01:00
Tadas Baltrusaitis
91cb3f9c39 Updating OpenBLAS (#594)
Updating the 64 bit OpenBLAS version for Windows to 0.3.3 (50% perf improvement on certain machines)
2018-10-25 20:15:11 +01:00
Tadas Baltrusaitis
77eae16732 Removing TBB dependency (#590)
Removing a TBB dependence for code parallelization (done through OpenCV's parralel_for_
2018-10-20 10:45:35 +01:00
Tadas Baltrusaitis
a274365998 Feature/code cleanup (#573)
* Header guard cleanup (making sure naming is compliant with C++ standards and consistent).

* Removing un-needed nullptr checks.

* Removing SSE warnings for x64 builds (as SSE is enabled by default no need for a flag)

* Reverting Mat deletion
2018-09-24 08:10:09 +01:00
Tadas Baltrusaitis
2e56628ec7 - Do not use AVX instructions by default, switch all project settings to SSE2
- Removing .user project settings which should not be tracked
2018-08-20 08:16:44 +01:00
Tadas Baltrusaitis
dbd921bd88 Attempting to move to modern cmake 2018-06-21 17:45:23 +01:00
Tadas Baltrusaitis
205f1ce689 Dlib update preparation for OSX and Ubuntu. 2018-06-18 16:28:14 +01:00
Tadas Baltrusaitis
cdecf902cd Updating licensing in source code files. More thorough travis tests. 2018-05-29 18:03:26 +01:00
Tadas Baltrusaitis
6ec5e70485 Closing the recorders properly. 2018-05-27 10:31:57 +01:00
Tadas Baltrusaitis
660e579582 Missing OpenBLAS includes 2018-05-26 17:18:12 +01:00
Tadas Baltrusaitis
e6849c6b52 Moving to AVX instead of AVX2, compiler warning fixes. Losing dependency on OpenCV C style bindings for affine warping. 2018-05-07 21:54:52 +01:00
Tadas Baltrusaitis
097d01fd3d Cleaning up includes. removing some C++ compilation warnings coming from dlib. 2018-05-06 20:46:18 +01:00
Tadas Baltrusaitis
838337c760 Moving OpenFace 2.0 to develop branch and getting ready for master. 2018-05-06 08:19:09 +01:00
Tadas Baltrusaitis
6e15e81777 Working towards coping without AU and eye models. Fixes to the visualizer. 2018-03-30 09:36:32 +01:00
Tadas Baltrusaitis
b1524ca98b Making sure AU visualization works with other executables. 2018-03-26 08:26:48 +01:00
Tadas Baltrusaitis
38a6dd59ab Fix with 32-bit compilation in Windows. 2018-03-01 20:17:58 +00:00
Tadas Baltrusaitis
4192e85a8f Some refinements for the multi face tracking support and cmake fixes. 2018-02-24 09:19:13 +00:00
Tadas Baltrusaitis
a4de1d42a5 Interface changes to provide multi output support, also enforcing parameters in executables. 2018-02-23 08:25:19 +00:00
Tadas Baltrusaitis
0c55fb9d80 Better organization of OpenCV dll's and packaging script for releases. 2018-02-05 18:14:36 +00:00
Tadas Baltrusaitis
bb7a5f197b Starting the move to OpenCV 3.4 2018-02-01 20:10:10 +00:00
Tadas Baltrusaitis
57c8bb75ea Working on the visualizer interoperability. 2018-01-19 16:17:22 +00:00
Tadas Baltrusaitis
7b039b2e7a Adding images for new wiki entries and some code for packaging releases. 2017-12-28 19:47:49 +00:00
Tadas Baltrusaitis
00bd196197 Adapting Cmake to new interface. 2017-12-13 17:50:48 +00:00
Tadas Baltrusaitis
89332ea943 More bug fixes revealed by demo scripts. 2017-11-22 17:53:15 +00:00
Tadas Baltrusaitis
41af428f5c Fix with reading multiple sequences and visualizing data in multi-face setting. 2017-11-22 17:37:26 +00:00
Tadas Baltrusaitis
7e16619529 Bug fix in opening video sequences revealed by a demo script. 2017-11-22 09:03:29 +00:00
Tadas Baltrusaitis
734c4fd34d Making sure all modules do eye tracking by default. More work on FaceLandmarkImg simplification. 2017-11-16 09:00:47 +00:00
Tadas Baltrusaitis
32862c32f4 Visualization fixes for demo executables. 2017-11-13 19:48:48 +00:00
Tadas Baltrusaitis
fa75910b6c Updating multi-face setup with the new interface. 2017-11-13 17:48:17 +00:00
Tadas Baltrusaitis
ae7497ef09 Fixes for linking to OpenBLAS. 2017-10-25 20:16:37 +01:00
Tadas Baltrusaitis
790e10fdbd Moving everything to world coordinate space to avoid confusion, it is still possible to call with respect to camera space through code though. 2017-10-24 16:26:08 +01:00
Tadas Baltrusaitis
c9061824c5 Adding direct OpenBLAS code for some speedups. 2017-10-23 18:54:02 +01:00
Tadas Baltrusaitis
e71d13a22a - some cleanup with depth 2017-10-21 12:15:22 +01:00
Tadas Baltrusaitis
5959176921 Some big changes:
- face validator is a retrained CNN now
- starting retiring CLM-Z from OpenFace
2017-08-01 17:11:02 -04:00
Tadas Baltrusaitis
305af01326 Auto stash before merge of "develop" and "origin/develop"
- Adding new license files
- Replacing images with more suitable CC ones
2017-05-08 21:36:23 -04:00
Guillaume Chanel
358cd6f9e2 Added the possibility to change the output videos codec by specifying the -oc option
A warning is now issued in the case the VideoWriter could not be instantiated, advising to change the codec
This change applies to FaceLandmarkVid* and FeatureExtraction executables
The option is used as "-oc CODEC_FOURCC" and defaults to DIVX. If the user inputs a FOURCC with a size different than 4, than the default codec is used
The option is handled by the function get_video_input_output_params in the LandMarkDetector namespace
2016-09-14 09:00:57 +02:00
Tadas Baltrusaitis
a81f1d3223 Merge pull request #39 from Temigo/master
Fix install in CMakeLists.txt files
2016-08-04 14:13:33 -04:00
Tadas Baltrusaitis
5416048697 Corrections for output, faster compilation in VS2015, retuning experiments. 2016-08-01 13:39:52 -04:00
Temigo
eedf6ea37e Fix install in CMakeLists.txt files 2016-08-01 11:34:23 +02:00
Tadas Baltrusaitis
ee15ecbc46 More testing and prettier drawing on images (with anti-aliasing) 2016-07-31 13:11:14 -04:00
Tadas Baltrusaitis
0445a97b0c Merge branch 'feature-travis' into develop 2016-07-31 12:11:35 -04:00
Tadas Baltrusaitis
808a189525 Fixing the project configurations to create consistently named executables. 2016-07-30 21:14:38 -04:00
Tadas Baltrusaitis
242ce8d130 Making sure failure returns 1 and success 0, adding an initial attempt at AppVeyor CI for Windows. 2016-07-29 13:04:25 -04:00
simonmssu
f5ed435e18 Update CMakeLists.txt
to specify the location of TBB header file
2016-07-11 16:13:37 -04:00
Tadas Baltrusaitis
4a73ece996 Changing project settings to allow for older CPUs without AVX2 instruction set. 2016-06-11 11:57:54 -04:00
unknown
57e58a6949 Master commit of OpenFace. 2016-04-28 15:40:36 -04:00