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
087202a5b3
removing old dep.
2017-10-26 15:21:43 +01:00
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
271c076f41
Merge branch 'develop' into feature/Windows-GUI
2017-10-26 08:06:18 +01:00
0980b1587c
Another attempt to resolve the include issues for gcc.
2017-10-25 19:32:36 +01:00
3a3b375197
Another attempt at a fix.
2017-10-25 19:13:47 +01:00
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
ea370ae43f
A fix for unix compilation.
2017-10-25 17:04:28 +01:00
9356344e91
Another missing include for cmake.
2017-10-25 08:39:38 +01:00
85a201c508
OpenBLAS cmake fixes.
2017-10-25 07:40:31 +01:00
7c98f6f378
Merge remote-tracking branch 'origin/develop' into feature/Windows-GUI
2017-10-24 16:28:31 +01:00
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
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
863b62adb8
Fixes to cmake with new face analyser separation.
2017-10-24 07:57:49 +01:00
c9061824c5
Adding direct OpenBLAS code for some speedups.
2017-10-23 18:54:02 +01:00
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
1f356eb8ae
More changes to bring up to speed for GUI:
...
- Outputting gaze angle
- Outputting eye landmarks
2017-10-21 20:40:18 +01:00
1cfb765bb9
Gaze estimation correction with offset, changing world coordinates to be default ones.
2017-10-20 21:59:10 +01:00
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
8cc98be724
First try at a new landmark validator.
2017-07-29 18:19:41 -04:00
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
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
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
bd0cebbef0
Merging newest master branch in.
2017-04-14 17:23:51 -04:00
1c546298b8
A small fix for linux compilation.
2017-03-08 14:25:13 -05:00
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
51f442a3e2
Merge pull request #107 from CJxD/develop
...
Fix CMake install process for Unix make install
2017-01-03 14:20:34 -05:00
b33fe0730a
Fix the make install process on Unix
...
Conflicts:
.gitignore
2016-12-18 00:10:43 +00:00
7b2bd15f2e
- A bug fix in FeatureExtraction when video is shorter than 3 frames.
...
- A small fix in head pose experiment output
2016-12-16 12:13:36 -05:00
29d13878da
Towards AU post-processing in the GUI.
2016-12-09 10:06:04 -05:00
ee48946818
Slightly better gaze estimation for off axis images.
2016-12-07 10:00:17 -05:00
d0cf22969c
Fixing gaze visualization, making sure the tests still run correctly. Adding other AU datasets for testing.
2016-12-06 13:02:45 -05:00
0befd5f756
Allowing to control the size of aligned output image
2016-12-05 17:28:39 -05:00
984cfb58e7
Adding gaze angle to features and to visualization.
2016-12-02 14:21:24 -05:00
9900e8b0de
Simplifying head pose estimation.
2016-11-23 17:17:26 -05:00
0a5110a003
Merge branch 'master' into Windows-GUI
...
Conflicts:
.gitignore
matlab_runners/Action Unit Experiments/DISFA_valid_res.txt
matlab_runners/Feature Point Experiments/results/fps_yt.mat
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/Gaze Experiments/mpii_1500_errs.txt
matlab_runners/Head Pose Experiments/results/Pose_OF.mat
2016-10-03 18:11:05 -04:00
c1ff40399e
Bug fixes
2016-09-06 12:32:33 -04:00
1b804c95b6
Merge branch 'master' into develop
2016-09-06 10:37:03 -04:00
96f9f5d06f
Merge branch 'feature/logging' into develop
2016-09-06 10:26:10 -04:00
c1431fe815
Fixes with drawing antialiased lines and landmarks using sub-pixel precision.
2016-09-06 10:20:31 -04:00
4c2e0bd9a0
Getting rid of some warnings.
2016-08-13 17:56:17 -04:00
a81f1d3223
Merge pull request #39 from Temigo/master
...
Fix install in CMakeLists.txt files
2016-08-04 14:13:33 -04:00
5416048697
Corrections for output, faster compilation in VS2015, retuning experiments.
2016-08-01 13:39:52 -04:00
eedf6ea37e
Fix install in CMakeLists.txt files
2016-08-01 11:34:23 +02:00
f80fbf0b42
Merge branch 'develop'
2016-07-22 13:29:17 -04:00
9d2d13bc1a
Small g++ fix
2016-07-22 12:57:30 -04:00
5d5947a41d
Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace
...
Conflicts:
.gitignore
2016-07-22 12:36:11 -04:00
2128589309
A lot of changes:
...
- New AU recognition models trained on extra datasets - Bosphorus, UNBC, FERA2011
- Cleaner and clearer separation of static and dynamic AU models
- AU training code cleaned up and instructions added
- bug fixes with median feature computation
- AU prediction correction (smoothing and shifting) with post processing
2016-07-22 09:35:50 -04:00
409e2a89f3
Update CMakeLists.txt
...
to specify the location of TBB header file
2016-07-11 16:15:18 -04:00
146dcd5e5b
More work on AU - WIP
2016-06-14 17:55:16 -04:00
Tadas Baltrusaitis