Commit Graph

12 Commits

Author SHA1 Message Date
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
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
8b5f8b9a36 Starting to work on MTCNN C++ implementation. 2017-08-09 11:00:38 -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
8eb086545c Simplified validator model. 2017-07-31 15:55:29 -04:00
Tadas Baltrusaitis
7513cf7964 Speeding up fancy face validation. 2017-07-29 21:11:16 -04:00
Tadas Baltrusaitis
596593cca3 Moving towards an optimized C++ version of CEN. 2017-06-19 16:35:11 -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
somacoder
86341fae30 Update LandmarkDetectorModel.h
Moving default boolean eye model assignment of false to cpp.
2017-02-23 13:45:09 -05:00
unknown
57e58a6949 Master commit of OpenFace. 2016-04-28 15:40:36 -04:00