Commit Graph

272 Commits

Author SHA1 Message Date
Tadas Baltrusaitis 884a063ca7 Merge branch 'develop' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI
# Conflicts:
#	exe/FaceLandmarkImg/FaceLandmarkImg.cpp
#	exe/FeatureExtraction/FeatureExtraction.cpp
#	lib/local/FaceAnalyser/FaceAnalyser.vcxproj
#	lib/local/FaceAnalyser/include/FaceAnalyser.h
#	lib/local/FaceAnalyser/include/Face_utils.h
#	lib/local/FaceAnalyser/include/PAW.h
#	lib/local/FaceAnalyser/include/PDM.h
#	lib/local/FaceAnalyser/src/FaceAnalyser.cpp
#	lib/local/FaceAnalyser/src/FaceAnalyserParameters.cpp
#	lib/local/FaceAnalyser/src/Face_utils.cpp
#	lib/local/FaceAnalyser/src/PAW.cpp
#	lib/local/FaceAnalyser/src/PDM.cpp
#	lib/local/GazeAnalyser/include/GazeEstimation.h
#	lib/local/GazeAnalyser/src/GazeEstimation.cpp
#	lib/local/LandmarkDetector/include/LandmarkDetectorUtils.h
#	lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp
#	matlab_runners/Action Unit Experiments/results/BP4D_valid_res_class.txt
#	matlab_runners/Action Unit Experiments/results/BP4D_valid_res_int.txt
#	matlab_runners/Action Unit Experiments/results/Bosphorus_res_class.txt
#	matlab_runners/Action Unit Experiments/results/Bosphorus_res_int.txt
#	matlab_runners/Action Unit Experiments/run_AU_prediction_BP4D.m
#	matlab_runners/Demos/feature_extraction_demo_vid.m
#	matlab_runners/Full_test_suite.m
2017-10-24 08:29:32 +01:00
Tadas Baltrusaitis 957c2bea0c Results with a standalone face analyser for action units. 2017-10-24 06:59:37 +01:00
Tadas Baltrusaitis 33ad89a670 Fixes for experiments on BP4D and Bosphorus 2017-10-23 21:24:17 +01:00
Tadas Baltrusaitis 5003f74fba Extra experiments with AUs. 2017-10-23 20:59:54 +01:00
Tadas Baltrusaitis c9061824c5 Adding direct OpenBLAS code for some speedups. 2017-10-23 18:54:02 +01:00
Tadas Baltrusaitis 6745873652 Adding test scripts for two extra datasets, testing single frame predictions on Bosphorus and asvid on BP4D. 2017-10-23 18:05:15 +01:00
Tadas Baltrusaitis 36f12c6d33 Merge branch 'develop' of https://github.com/TadasBaltrusaitis/OpenFace into develop 2017-10-23 17:58:54 +01:00
Tadas Baltrusaitis f038f8cc65 AU prediction de-coupling from landmark detection modules, allowing different PDMs to be used (or a different 68 point detector altogether). 2017-10-23 17:58:35 +01:00
Tadas Baltrusaitis 7bbca6c48c Gaze output correction 2017-10-22 20:55:47 +01:00
Tadas Baltrusaitis 729d9a9a85 Adding ability to output eye landmark locations during image processing. 2017-10-22 20:02:54 +01:00
Tadas Baltrusaitis af4f68075b With new head pose estimation. 2017-10-22 11:02:20 +01:00
Tadas Baltrusaitis 28fd07fe74 Bug fix with reporting of pose orientation in world coordinates (reported axis angle instead of Euler) 2017-10-22 10:55:57 +01:00
Tadas Baltrusaitis 4b85fe21ac Reporting a gaze angle that makes more sense. 2017-10-22 10:03:23 +01:00
Tadas Baltrusaitis 1f356eb8ae More changes to bring up to speed for GUI:
- Outputting gaze angle
- Outputting eye landmarks
2017-10-21 20:40:18 +01:00
Tadas Baltrusaitis e71d13a22a - some cleanup with depth 2017-10-21 12:15:22 +01:00
Tadas Baltrusaitis f6f0d6201c Script for validating GUI output correctness. 2017-10-21 10:05:48 +01:00
Tadas Baltrusaitis 1cfb765bb9 Gaze estimation correction with offset, changing world coordinates to be default ones. 2017-10-20 21:59:10 +01:00
Tadas Baltrusaitis f55ad777e1 Some small fixes after the merge. 2017-10-18 03:09:47 -04:00
Tadas Baltrusaitis 0de2379463 Merge branch 'master' into feature/Windows-GUI
# Conflicts:
#	.gitignore
#	exe/FaceLandmarkVid/FaceLandmarkVid.cpp
#	exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
#	exe/FeatureExtraction/FeatureExtraction.cpp
#	lib/local/FaceAnalyser/src/FaceAnalyser.cpp
#	lib/local/LandmarkDetector/include/LandmarkDetectorUtils.h
#	lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp
#	matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt
#	matlab_runners/Action Unit Experiments/results/FERA2011_res_class.txt
#	matlab_runners/Action Unit Experiments/results/SEMAINE_valid_res.txt
#	matlab_runners/Demos/Read_HOG_file.m
#	matlab_runners/Demos/feature_extraction_demo_img_seq.m
#	matlab_runners/Feature Point Experiments/results/fps_yt.mat
#	matlab_runners/Feature Point Experiments/results/fps_yt.txt
#	matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf
#	matlab_runners/Feature Point Experiments/results/landmark_detections.mat
#	matlab_runners/Gaze Experiments/mpii_1500_errs.mat
#	matlab_runners/Head Pose Experiments/results/Pose_OF.mat
#	matlab_runners/Head Pose Experiments/results/Pose_OF.txt
2017-10-18 03:01:47 -04:00
Tadas Baltrusaitis ddd0536b70 ZeroMQ dependencies. 2017-10-17 09:03:39 +01:00
Tadas Baltrusaitis a47cbc5fd8 Some adaptation of experiments with new visualization. 2017-10-14 21:26:04 +01:00
Tadas Baltrusaitis 239ce3f693 Better script for reading hog files. 2017-10-13 08:56:27 +01:00
Tadas Baltrusaitis 46bd0869ad More fine grained visualization during FeatureExtraction, and updating face validation readme. 2017-10-13 08:38:12 +01:00
Tadas Baltrusaitis a4d20fc9b4 A small change to MPII script (not using wild parameters makes it more accurate). 2017-09-19 10:55:04 +01:00
Tadas Baltrusaitis c6a26861e6 Merge pull request #250 from Lydorn/patch-1
Update LandmarkDetectorUtils.cpp
2017-09-19 10:19:43 +01:00
Tadas Baltrusaitis 91c3016d1a Bug fix when -gaze is used. 2017-09-19 10:18:57 +01:00
Nicolas Girard d01ade795b Update LandmarkDetectorUtils.cpp
Important change: Lines 1446 and 1446, fixed loop index not being used
The other lines are identical, I had a warning about changing the file encoding from windows-* to utf8 maybe that is why.
2017-09-18 15:19:41 +02:00
Tadas Baltrusaitis c7f0e5e926 Newest results. 2017-09-11 08:03:29 +01:00
Tadas Baltrusaitis f02951954c Removing clang compilation with travis. 2017-09-10 21:07:37 +01:00
Tadas Baltrusaitis ec3adc5129 Another attempt at clang tbb travis fix. 2017-09-10 19:16:39 +01:00
Tadas Baltrusaitis 702a4112b9 Potential travis fix. 2017-09-10 16:31:03 +01:00
Tadas Baltrusaitis 1685a9c6a8 A bug fix with hierarchical models and the multi-view setting. 2017-09-10 12:30:19 +01:00
Tadas Baltrusaitis cdd258330f Merge branch 'feature/new_validator' into develop 2017-08-02 13:40:56 -04:00
Tadas Baltrusaitis 9a92d4d9c8 Removing legacy CLM-Z models. 2017-08-02 13:39:31 -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 8cc98be724 First try at a new landmark validator. 2017-07-29 18:19:41 -04:00
Tadas Baltrusaitis 83f6e11935 Small fix. 2017-07-29 11:22:35 -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 8daf4cf69c Merge branch 'master' into develop 2017-06-20 17:26:01 -04:00
Tadas Baltrusaitis d40e57a4c4 Merge pull request #205 from yorkie/fix/detector
parameters: when fdloc provided, set detector to use HAAR cascade
2017-06-15 12:06:02 -04:00
yorkie a539e73b93 parameters: when fdloc provided, set detector to use HAAR cascade 2017-06-15 11:13:42 +08:00
Tadas Baltrusaitis 34c81ee113 Merge pull request #202 from yorkie/add/fdloc
add -fdloc for customize face detection/classifier files
2017-06-14 15:11:48 -04:00
yorkie 138c8bd463 add -fdloc for customize face detection/classifier files 2017-06-14 11:46:44 +08:00
Tadas Baltrusaitis 10c53c8df8 Corrections of the copyright. 2017-06-06 18:53:06 -04:00
Tadas Baltrusaitis fbc1f5b699 ZeroMQ fixes for head pose tracker and solution fixes for head pose mode. 2017-05-29 16:42:36 -04:00
Tadas Baltrusaitis cd68dd39c1 Adding missing ZMQ packages 2017-05-29 15:54:07 -04:00
Tadas Baltrusaitis f98ae0747e Big restructure of the code, moving closer to a new version with a GUI:
- Adding a new boost version (1.63)
- Decoupling FaceAnalyser from LandmarkDetector
- FaceAnalyser is much easier to load with a parameters class
- Moving GazeAnalyser as a separate library
- GUI now uses new FaceAnalyser, LandmarkDetector, and GazeAnalyser
2017-05-18 17:04:38 -04:00
Tadas Baltrusaitis 788356c685 - Adding proper license
- Cleaning up image processing
2017-05-15 14:55:18 -04:00