Commit graph

207 commits

Author SHA1 Message Date
Tadas Baltrusaitis
dcb9d90eca Fixing recorder and visualizer for FaceLandmarkImg 2017-11-16 17:46:34 +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
c93004f03d Bug fix with intrinsics. 2017-11-15 20:20:17 +00:00
Tadas Baltrusaitis
1b80d55094 Towards adding hogs. 2017-11-15 20:06:23 +00:00
Tadas Baltrusaitis
03a7fc2309 ImageCapture fix when bounding box not found. 2017-11-15 09:03:41 +00:00
Tadas Baltrusaitis
c547b380b6 Clearer error reporting. 2017-11-14 20:19:11 +00:00
Tadas Baltrusaitis
8947395ca5 Working on a new image interface. 2017-11-14 19:59:08 +00:00
Tadas Baltrusaitis
dfdebd1e60 Getting ready to process images with the new interface. 2017-11-14 09:05:20 +00:00
Tadas Baltrusaitis
6500865a0b Code cleanup with visualization. 2017-11-14 07:54:02 +00:00
Tadas Baltrusaitis
9f4bf5724f Simplifying the visualizer and using it in FaceLandmarkVid 2017-11-13 17:30:19 +00:00
Tadas Baltrusaitis
fa48372f4c Adding a dedicated FPS tracker. 2017-11-13 09:07:52 +00:00
Tadas Baltrusaitis
bee6d185cb Some more bug fixes with visualization and recording. Creating a metafile for recorded data. 2017-11-12 21:40:30 +00:00
Tadas Baltrusaitis
fd4d06166a Better gaze visualization. 2017-11-12 13:26:51 +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
42bcb55d28 Adding visualization utilities files. 2017-11-11 10:08:02 +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
312d9e9608 Fixing scripts with new capture and recorder. 2017-11-10 20:40:59 +00:00
Tadas Baltrusaitis
db5b5fceda Sequence capture fix and landmark vid simplification. 2017-11-10 19:01:43 +00:00
Tadas Baltrusaitis
d5a3af7ece Integrating SequenceCapture to FaceLandmarkVid 2017-11-10 18:49:30 +00:00
Tadas Baltrusaitis
e58ccaa73d Visualization fix, and fix with sequence reading from video files. 2017-11-10 08:57:34 +00:00
Tadas Baltrusaitis
4959640b03 Another bugfix with sequence capture. 2017-11-10 07:57:33 +00:00
Tadas Baltrusaitis
919c79ce7d Camera intrinsic setup bug. 2017-11-09 21:04:25 +00:00
Tadas Baltrusaitis
d923c96906 A couple of bug fixes for sequence capture. 2017-11-09 20:43:53 +00:00
Tadas Baltrusaitis
e22060d073 Getting ready to testing a new sequence recorder. 2017-11-09 19:56:16 +00:00
Tadas Baltrusaitis
8ded025baf More refactorization. 2017-11-09 18:37:26 +00:00
Tadas Baltrusaitis
6c14aeab89 Big cleanup for SequenceCapture 2017-11-09 18:25:49 +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
4b54738b68 More work on sequence capture. 2017-11-08 21:13:02 +00:00
Tadas Baltrusaitis
839e1bc738 Working on sequence captures. 2017-11-08 20:50:46 +00:00
Tadas Baltrusaitis
75bb688d2c Sequence capture files added to the project. 2017-11-08 20:22:14 +00:00
Tadas Baltrusaitis
a1235efce8 SequenceCapture work. 2017-11-08 20:08:17 +00:00
Tadas Baltrusaitis
e8511cd10f Working on SequenceCapture functionality. 2017-11-08 19:38:37 +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
71407c9067 isSequence fix. 2017-11-07 07:46:25 +00:00
Tadas Baltrusaitis
b37335052c Fix with sequence recording. 2017-11-06 20:24:04 +00:00
Tadas Baltrusaitis
0e428cca45 Work on experiments and experiment scripts, together with recording parameters. 2017-11-05 10:30:40 +00:00
Tadas Baltrusaitis
ac96608bfd Two output bug fixes. 2017-11-05 09:30:56 +00:00
Tadas Baltrusaitis
1159caba75 Output similarity aligned faces through recorder. 2017-11-05 08:51:27 +00:00
Tadas Baltrusaitis
c80016fc0c Some recording fixes and cleanup 2017-11-05 08:14:01 +00:00
Tadas Baltrusaitis
ca3b252d19 Some more model simplification, only write the header on first write 2017-11-05 07:45:19 +00:00
Tadas Baltrusaitis
cb229ad50b More recorder simplification. 2017-11-04 20:57:24 +00:00
Tadas Baltrusaitis
8beb7e58c4 Starting to introduce recording parameters for simplicity. 2017-11-03 21:35:55 +00:00
Tadas Baltrusaitis
7f3ed9c855 Towards a big recording simplification. 2017-11-03 20:00:24 +00:00
Tadas Baltrusaitis
5ff3d43db9 Project updates 2017-11-03 19:48:11 +00:00
Tadas Baltrusaitis
1d8bc8c510 Fixes. 2017-11-03 16:40:07 +00:00
Tadas Baltrusaitis
16918e7fb5 More work on recording, getting there 2017-11-03 09:04:00 +00:00
Tadas Baltrusaitis
b60669fa62 Continuing work on the recorder. 2017-11-03 08:34:55 +00:00
Tadas Baltrusaitis
4f4bf263d6 More work on the recorder. 2017-11-02 20:11:58 +00:00
Tadas Baltrusaitis
be5a4cd41d Small fix for references in class variables. 2017-11-02 09:08:24 +00:00
Tadas Baltrusaitis
f00d1fe51e Working on the recorder interface. 2017-11-02 09:06:53 +00:00
Tadas Baltrusaitis
822ade42b9 Working for first incorporation of Recorder to FeatureExtraction 2017-11-01 20:29:57 +00:00
Tadas Baltrusaitis
550b325095 Bit more on HOG recording. 2017-11-01 20:03:31 +00:00
Tadas Baltrusaitis
32a9ee0a7e Working on the HOG recorder. 2017-11-01 19:59:23 +00:00
Tadas Baltrusaitis
b9378f8e5e Starting work on a separate recorder, this will allow for a nicer separation of executables and utilities and make it much easier to integrate with the GUI as it will not rely on it's own recorder. 2017-11-01 19:39:49 +00:00
Tadas Baltrusaitis
0ac039d708 Preparing for processing of image files, and a new image output format. 2017-10-30 09:43:03 +00:00
Tadas Baltrusaitis
8d996cce62 Preparing for static AU prediction. 2017-10-30 07:50:33 +00:00
Tadas Baltrusaitis
569a81ae39 Bounding box visualization fix for opening image sequences in the GUI. 2017-10-29 10:43:25 +00:00
Tadas Baltrusaitis
9db16cbb60 Adding missing OpenBLAS refs, also unifying csv output precision between GUI and console versions of code. 2017-10-28 22:03:12 +01:00
Tadas Baltrusaitis
67bf8706de Merge branch 'develop' into feature/Windows-GUI
# Conflicts:
#	OpenFace.sln
#	lib/local/FaceAnalyser/FaceAnalyser.vcxproj.filters
#	lib/local/GazeAnalyser/GazeAnalyser.vcxproj
2017-10-26 17:42:43 +01:00
Tadas Baltrusaitis
087202a5b3 removing old dep. 2017-10-26 15:21:43 +01:00
Tadas Baltrusaitis
7bcbb5e189 Separating gaze analysis into a separate project, getting closer to being ready to integrate GUI and CE-CLM branches. 2017-10-26 08:50:15 +01:00
Tadas Baltrusaitis
271c076f41 Merge branch 'develop' into feature/Windows-GUI 2017-10-26 08:06:18 +01:00
Tadas Baltrusaitis
0980b1587c Another attempt to resolve the include issues for gcc. 2017-10-25 19:32:36 +01:00
Tadas Baltrusaitis
3a3b375197 Another attempt at a fix. 2017-10-25 19:13:47 +01: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
ea370ae43f A fix for unix compilation. 2017-10-25 17:04:28 +01:00
Tadas Baltrusaitis
9356344e91 Another missing include for cmake. 2017-10-25 08:39:38 +01:00
Tadas Baltrusaitis
85a201c508 OpenBLAS cmake fixes. 2017-10-25 07:40:31 +01:00
Tadas Baltrusaitis
7c98f6f378 Merge remote-tracking branch 'origin/develop' into feature/Windows-GUI 2017-10-24 16:28:31 +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
863b62adb8 Fixes to cmake with new face analyser separation. 2017-10-24 07:57:49 +01:00
Tadas Baltrusaitis
c9061824c5 Adding direct OpenBLAS code for some speedups. 2017-10-23 18:54:02 +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
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
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
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
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
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
788356c685 - Adding proper license
- Cleaning up image processing
2017-05-15 14:55:18 -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