Tadas Baltrusaitis
a8ec41e91f
Merge remote-tracking branch 'origin/master' into feature/Windows-GUI
...
Conflicts:
exe/FeatureExtraction/FeatureExtraction.cpp
2017-10-29 11:40:52 +00:00
Tadas Baltrusaitis
de4e351c65
Performance fix, and feature extraction as video file count fix.
2017-10-29 10:58:56 +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
b668facb00
Redefinition of variable fix.
2017-10-28 20:46:22 +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
ae7497ef09
Fixes for linking to OpenBLAS.
2017-10-25 20:16:37 +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
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