Tadas Baltrusaitis
b224fcdfc9
Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI
...
# Conflicts:
# .gitignore
# exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
# lib/local/FaceAnalyser/FaceAnalyser.vcxproj
# lib/local/LandmarkDetector/include/LandmarkDetectorUtils.h
# lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp
# matlab_runners/Demos/feature_extraction_demo_vid.m
# matlab_runners/Demos/gaze_extraction_demo_vid.m
2017-12-29 16:27:00 +00:00
Tadas Baltrusaitis
1e1a44c61f
Removing no longer needed functions.
2017-12-23 10:13:07 +00:00
Tadas Baltrusaitis
077a8489bc
Bosphorus experiments with the new interface, improved the results slightly.
2017-12-06 15:43:55 +00:00
Tadas Baltrusaitis
aba30079e6
Making sure non detected frames are 0.
2017-11-25 18:46:53 +00:00
Tadas Baltrusaitis
ea0f658190
Dealing better with non-tracked frames.
2017-11-25 10:12:34 +00:00
Tadas Baltrusaitis
c15a5042a9
Confidence reporting bug if not tracked in first frame.
2017-11-24 17:44:32 +00:00
Tadas Baltrusaitis
734c4fd34d
Making sure all modules do eye tracking by default. More work on FaceLandmarkImg simplification.
2017-11-16 09:00:47 +00:00
Tadas Baltrusaitis
6500865a0b
Code cleanup with visualization.
2017-11-14 07:54:02 +00:00
Tadas Baltrusaitis
73d8dddbb2
Some bug fixes with visualization.
2017-11-12 11:24:25 +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
4f890a7d42
Adding visualization files to the project.
2017-11-11 09:22:15 +00:00
Tadas Baltrusaitis
420271ef23
Moving visualization out of landmark detection.
2017-11-11 09:14:45 +00:00
Tadas Baltrusaitis
53d7d6b78c
Continuing working on sequence capture, leading to quite a big cleanup in FeatuerExtraction.cpp
2017-11-08 21:35:27 +00:00
Tadas Baltrusaitis
9c1fc21da1
Script fixes, and confidence correction where it should be (not in the executable scripts), starting work on capture in utilities
2017-11-08 09:02:50 +00:00
Tadas Baltrusaitis
16918e7fb5
More work on recording, getting there
2017-11-03 09:04:00 +00:00
Tadas Baltrusaitis
038ce5823d
Merge branch 'develop' into feature/Windows-GUI
...
# Conflicts:
# exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
# lib/local/GazeAnalyser/src/GazeEstimation.cpp
# lib/local/LandmarkDetector/include/LandmarkDetectorFunc.h
# lib/local/LandmarkDetector/src/LandmarkDetectorFunc.cpp
2017-10-25 17:21:47 +01:00
Tadas Baltrusaitis
790e10fdbd
Moving everything to world coordinate space to avoid confusion, it is still possible to call with respect to camera space through code though.
2017-10-24 16:26:08 +01:00
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
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
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
1cfb765bb9
Gaze estimation correction with offset, changing world coordinates to be default ones.
2017-10-20 21:59:10 +01: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
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
1685a9c6a8
A bug fix with hierarchical models and the multi-view setting.
2017-09-10 12:30:19 +01: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
yorkie
a539e73b93
parameters: when fdloc provided, set detector to use HAAR cascade
2017-06-15 11:13:42 +08:00
yorkie
138c8bd463
add -fdloc for customize face detection/classifier files
2017-06-14 11:46:44 +08: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
fa76d9051c
Merge branch 'master' into feature/Windows-GUI
...
Conflicts:
matlab_runners/Demos/feature_extraction_demo_vid.m
2017-05-15 13:19: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
Tadas Baltrusaitis
bd0cebbef0
Merging newest master branch in.
2017-04-14 17:23:51 -04: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
15ee31bece
Update LandmarkDetectorModel.cpp
...
Moved eye_model false assignment from header.
2017-02-23 13:46:39 -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
c334bf0ac3
Use preprocessor defines rather than configured header files for CONFIG_DIR so it works when not using CMake
2016-12-29 23:36:10 +00:00
Chris Watts
b33fe0730a
Fix the make install process on Unix
...
Conflicts:
.gitignore
2016-12-18 00:10:43 +00:00
Tadas Baltrusaitis
99191fd3c9
Simplification of Recording in WPF through a separate file and data binding (WIP).
2016-12-08 16:14:06 -05:00
Tadas Baltrusaitis
2854b86733
Bug fix for gaze visualization.
2016-11-28 17:27:32 -05:00
Tadas Baltrusaitis
a57fbdea7b
Towards better eye landmark vis.
2016-11-28 15:34:42 -05:00
Tadas Baltrusaitis
9900e8b0de
Simplifying head pose estimation.
2016-11-23 17:17:26 -05:00
takiyu
7fc945cf70
Fix lack of a bounding box argument
2016-10-21 00:07:11 +09:00
Tadas Baltrusaitis
8a30e55f4b
ROI, face distance and demo mode CLNF file.
2016-10-06 16:17:33 -04:00