Commit Graph

57 Commits

Author SHA1 Message Date
Tadas Baltrusaitis
ccd018ae65 Changing how filesystem includes are handled to support systems that have boost installed. (#738) 2019-07-08 17:09:21 +01:00
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
126b34f181 Ability to specify output image formats and removing unused quiet parameter. 2018-11-04 13:10:28 +00: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
630aba9006 Removing code duplication and getting rid of some C++ warnings due to float/double and signed/unsigned mixing. 2018-09-18 08:24:16 +01:00
Tadas Baltrusaitis
6609388d05 Fixing some OpenCV namespaces and getting ready for OpenCV 4.0.0 2018-07-18 08:17:38 +01:00
Tadas Baltrusaitis
79d7116dae Bug fix with output aligned faces and videos if no face is detected in the first frame. Adding .webm file support 2018-06-29 09:57:45 +01:00
Tadas Baltrusaitis
feb6dbd25d Header mistake fix. 2018-06-25 19:53:01 +02:00
Tadas Baltrusaitis
2e265f0905 Some header cleanup 2018-06-25 17:15:17 +02:00
Tadas Baltrusaitis
0517bbbd72 Separating threading on unix and windows systems. 2018-05-31 20:57:20 +01:00
Tadas Baltrusaitis
6569601652 CLR does not agree with C++ threads, so moving back to tbb task_group 2018-05-31 08:15:23 +01:00
Tadas Baltrusaitis
0d758babf8 A different way of threading output. 2018-05-30 20:13:47 +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
881c10d49d Ability to not save bad aligned frames (saving space). FaceLandmarkVidMulti not copying the CEN patch experts to save space, allowing it to run on Win32. 2018-05-22 17:48:28 +01:00
Tadas Baltrusaitis
40a975c6c6 Getting rid of some compiler warnings. 2018-05-06 20:51:50 +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
5ed6c4a6f3 Starting integration of AU visualization in CLI code. 2018-03-24 10:30:30 +00:00
Séverin Lemaignan
dba96e1551 Added support for AUs visualization to FeatureExtractor 2018-03-19 10:09:04 +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
da458f1ab6 Cleaning up reading from a webcam. 2018-01-27 07:46:21 +00:00
Tadas Baltrusaitis
85262b72c7 More work on visualization interop. 2018-01-19 16:33:17 +00:00
Tadas Baltrusaitis
57c8bb75ea Working on the visualizer interoperability. 2018-01-19 16:17:22 +00:00
Tadas Baltrusaitis
d5f63dbbe3 Continuing work on the recorder interop for recording in c# 2018-01-18 08:08:29 +00:00
Tadas Baltrusaitis
deec0528cb Working on the recorder interop 2018-01-16 08:58:51 +00:00
Tadas Baltrusaitis
fd45ec7ca5 Making sure stuff compiles after the merge. 2018-01-02 18:09:11 +00:00
Tadas Baltrusaitis
d0279d2224 Some more fixes to better support 16 bit. 2017-12-15 20:01:28 +00:00
Tadas Baltrusaitis
7d58b86020 Some plumbing:
- support for 16 bit images
- preventing copy constructors for certain utilities classes
2017-12-15 19:56:58 +00:00
Tadas Baltrusaitis
45548b097a Fixing focal length issues for gaze esitimation experiments. 2017-12-13 20:22:22 +00:00
Tadas Baltrusaitis
67041371dd Correct metafile output for webcam. 2017-12-12 17:48:46 +00:00
Tadas Baltrusaitis
e629ae50be A number of fixes to the recorder:
- camera parameters in the meta file
- fixing bug with video output
- Relative and full path input in the meta file
2017-12-12 08:55:23 +00:00
Tadas Baltrusaitis
9fec91e997 DISFA and SEMAINE with new interface. 2017-12-08 17:22:30 +00:00
Tadas Baltrusaitis
1d3f32b7df Working towards better metafile information. 2017-12-04 11:48:44 +00:00
Tadas Baltrusaitis
21bdf03801 More patches and small fixes for recording and visualization. 2017-11-24 17:16:15 +00:00
Tadas Baltrusaitis
89332ea943 More bug fixes revealed by demo scripts. 2017-11-22 17:53:15 +00:00
Tadas Baltrusaitis
974cee63b9 Fixes for loading images with new interface. 2017-11-18 21:08:43 +00:00
Tadas Baltrusaitis
5a483f7486 Bug fix with default recording directory. 2017-11-17 07:54:22 +00:00
Tadas Baltrusaitis
fc187498e8 Outputing images properly and out_dir should be the main way to specify output directory 2017-11-16 20:50:08 +00:00
Tadas Baltrusaitis
8947395ca5 Working on a new image interface. 2017-11-14 19:59:08 +00:00
Tadas Baltrusaitis
dfdebd1e60 Getting ready to process images with the new interface. 2017-11-14 09:05:20 +00:00
Tadas Baltrusaitis
9f4bf5724f Simplifying the visualizer and using it in FaceLandmarkVid 2017-11-13 17:30:19 +00:00
Tadas Baltrusaitis
fa48372f4c Adding a dedicated FPS tracker. 2017-11-13 09:07:52 +00:00
Tadas Baltrusaitis
bee6d185cb Some more bug fixes with visualization and recording. Creating a metafile for recorded data. 2017-11-12 21:40:30 +00:00
Tadas Baltrusaitis
5ce0a8d4bf More visualization cleanup and removal of redundant code. 2017-11-12 10:55:47 +00:00
Tadas Baltrusaitis
e1c260eee6 Continuing towards visualizer integration and 3D eye landmark inclusion in output. Cleanup of rotation conversion in unilities 2017-11-11 21:13:29 +00:00
Tadas Baltrusaitis
e636b4ca7c Moving shared rotation helpers to utilities, so as not to double code. 2017-11-11 11:57:57 +00:00
Tadas Baltrusaitis
42bcb55d28 Adding visualization utilities files. 2017-11-11 10:08:02 +00:00
Tadas Baltrusaitis
312d9e9608 Fixing scripts with new capture and recorder. 2017-11-10 20:40:59 +00:00
Tadas Baltrusaitis
d5a3af7ece Integrating SequenceCapture to FaceLandmarkVid 2017-11-10 18:49:30 +00:00