Commit Graph

21 Commits

Author SHA1 Message Date
Tadas Baltrusaitis
937e2de488 Integrating OpenFace 1.0.0 changes into CE-CLM branch 2018-04-04 17:48:44 +01:00
Tadas Baltrusaitis
aa2b0c9def Adapting eye gaze script, moving to new multi-face interface, a bug fix in rotation conversion 2018-02-27 08:08:02 +00:00
Tadas Baltrusaitis
4fe4fa0b24 Removing redundant functions (rotation conversions) that have been defined in utilities now. 2018-02-15 08:24:24 +00:00
Tadas Baltrusaitis
7eae28a2e7 Adapting FaceLandmarkVidMulti 2018-02-13 08:18:22 +00:00
Tadas Baltrusaitis
6566f1084f More float simplifications. 2017-10-20 08:08:03 +01:00
Tadas Baltrusaitis
f62516789c Simplifying conversion to grayscale 2017-08-26 17:01:54 +01:00
Tadas Baltrusaitis
e8e93c3f96 Incorporating MTCNN face detection with CE-CLM.
Merge remote-tracking branch 'origin/feature/mtcnn_face_det' into feature/CE-CLM

# Conflicts:
#	exe/FaceLandmarkImg/FaceLandmarkImg.cpp
#	exe/FaceLandmarkVid/FaceLandmarkVid.cpp
#	exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
#	exe/FeatureExtraction/FeatureExtraction.cpp
#	lib/local/LandmarkDetector/LandmarkDetector.vcxproj
#	lib/local/LandmarkDetector/LandmarkDetector.vcxproj.filters
#	lib/local/LandmarkDetector/src/LandmarkDetectorFunc.cpp
#	lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp
#	lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp
2017-08-26 13:23:16 +01:00
Tadas Baltrusaitis
452d1b8008 Integrating MTCNN in all of the demos. 2017-08-18 20:57:19 +01:00
Tadas Baltrusaitis
a251415fea Starting to incorporate MTCNN 2017-08-18 10:03:01 +01:00
Tadas Baltrusaitis
8dea625717 Adding more preparation for MTCNN in C++ 2017-08-09 12:01:53 -04:00
Tadas Baltrusaitis
f19fab7ff7 Bringing CE-CLM up to speed with master. 2017-08-03 11:14:49 -04: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
165a708796 Decoupling C++ code so that AU detection works properly with a new PDM. 2017-06-20 14:55:59 -04:00
Tadas Baltrusaitis
85c603a85c OpenBLAS fix attempt. 2017-06-12 20:32:59 -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
TadasBaltrusaitis
58daee692e Merge branch 'master' into feature/DCCNF
# Conflicts:
#	.gitignore
#	exe/FaceLandmarkImg/FaceLandmarkImg.cpp
#	exe/FeatureExtraction/FeatureExtraction.cpp
#	matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf
#	matlab_runners/Feature Point Experiments/results/landmark_detections.mat
#	matlab_runners/Feature Point Experiments/run_OpenFace_feature_point_tests_300W.m
#	matlab_runners/Gaze Experiments/mpii_1500_errs.mat
2017-04-10 11:04:30 -04:00
Tadas Baltrusaitis
4e0e947391 Experimental addition of OpenBLAS to speed up matrix multiplications. 2017-02-10 17:09:08 -05: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
ee15ecbc46 More testing and prettier drawing on images (with anti-aliasing) 2016-07-31 13:11:14 -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
unknown
57e58a6949 Master commit of OpenFace. 2016-04-28 15:40:36 -04:00