Commit Graph

64 Commits

Author SHA1 Message Date
Tadas Baltrusaitis
144c44bf61 Mirror id's bug fix with a constructor, quicker HOG model loading. 2017-09-14 08:10:03 +01:00
Tadas Baltrusaitis
bac0083716 Fixes to cmake files for ubuntu, and fixes for gcc compiler. 2017-09-02 15:47:44 +01:00
Tadas Baltrusaitis
c96aa6391b Dealing with unusual image formats (16 bit and 4 channel). 2017-09-02 09:01:24 +01:00
Tadas Baltrusaitis
2225ec6f45 First feature point experiment results on 300VW data using CE-CLM C++ version. 2017-09-01 19:31:28 +01:00
Tadas Baltrusaitis
f62516789c Simplifying conversion to grayscale 2017-08-26 17:01:54 +01:00
Tadas Baltrusaitis
ba6a497fcc Better output visualization in images when there are multiple faces 2017-08-26 15:47:10 +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
abcc91364e Towards MTCNN, implementing PNet 2017-08-10 15:30:35 -04: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
39d0dac347 Bug fix with writing video file out when -fdir is used for loading video in. 2017-07-25 14:18:45 -04:00
Tadas Baltrusaitis
6eff7c7c1e Cmake fixes for adding GazeAnalyzer. 2017-07-11 15:13:56 -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
153c800eeb Make list fixes for BLAS 2017-06-12 20:19:43 -04:00
Tadas Baltrusaitis
79b22c0f1c Try BLAS again 2017-06-12 16:45:08 -04:00
Tadas Baltrusaitis
4a5ebe2518 Further work at blas inclusion. 2017-06-12 16:37:41 -04:00
Tadas Baltrusaitis
9396b54bec BLAS for ubuntu. 2017-06-12 16:27:32 -04:00
Tadas Baltrusaitis
8de395d4ef Blas fixes for C++ code. 2017-06-12 15:58:19 -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
1c546298b8 A small fix for linux compilation. 2017-03-08 14:25:13 -05:00
Tadas Baltrusaitis
52c50b4ff3 - Fixing the issue with gaze not tracking properly in video and landmark modes.
- Fixing the simscale/simalign bug
2017-03-08 11:46:50 -05:00
somacoder
764337e2a1 Disable Key Presses if Quiet Mode Enabled
Enables running without OpenCV calling on GTK, which you do not installed if running in a non-interactive manner. Perhaps better solution exist if "interactive" command line was added.
2017-03-05 15:49:01 -05:00
Tadas Baltrusaitis
4e0e947391 Experimental addition of OpenBLAS to speed up matrix multiplications. 2017-02-10 17:09:08 -05:00
Tadas Baltrusaitis
51f442a3e2 Merge pull request #107 from CJxD/develop
Fix CMake install process for Unix make install
2017-01-03 14:20:34 -05:00
Chris Watts
dbe677db38 Forgot to add fallback define for CONFIG_DIR in FaceLandmarkImg 2016-12-31 16:52:30 +00:00
Chris Watts
4260f6a20e Fix AU and triangulation loading for FaceLandmarkImg and FeatureExtraction 2016-12-29 23:40:03 +00:00
Chris Watts
d21921efdd Include FeatureExtraction in installed bin directory 2016-12-29 23:39:00 +00:00
Guillaume Chanel
11031f5a36 Bug correction: FeatureExtraction file header corrected. 2016-09-16 10:49:18 +02:00
Tadas Baltrusaitis
3b33fdc44d More work towards 300VW evaluation. 2016-09-15 16:17:00 -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
1b804c95b6 Merge branch 'master' into develop 2016-09-06 10:37:03 -04:00
Tadas Baltrusaitis
ef15d5c2cd Getting rid of compiler warnings. 2016-08-14 10:20:07 -04:00
Tadas Baltrusaitis
4c2e0bd9a0 Getting rid of some warnings. 2016-08-13 17:56:17 -04: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
Tadas Baltrusaitis
2f667bf23d Ubuntu case sensitivity fix in travis test, making sure a check is made to see if image output is successful. 2016-08-01 10:14:58 -04:00
Temigo
eedf6ea37e Fix install in CMakeLists.txt files 2016-08-01 11:34:23 +02:00
Tadas Baltrusaitis
3fc388cdeb Fixes with -inroot and -outroot 2016-07-31 20:55:29 -04:00
Tadas Baltrusaitis
51ae195124 A number of small fixes, renamings and corrections. 2016-07-31 16:31:17 -04: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
bb7ba5ba60 A fix to a previous fix - OpenCV does not handle Debug/Release mixing with writing out ,jpeg and .png files, so use .bmp instead 2016-07-31 10:09:35 -04:00
Tadas Baltrusaitis
a62de100e4 A fix to deal with OpenCV not liking to output png in Debug mode. Feature extraction now saves jpg instead of png for aligned face images. 2016-07-31 09:31:47 -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