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
e636b4ca7c
Moving shared rotation helpers to utilities, so as not to double code.
2017-11-11 11:57:57 +00:00
42bcb55d28
Adding visualization utilities files.
2017-11-11 10:08:02 +00:00
4f890a7d42
Adding visualization files to the project.
2017-11-11 09:22:15 +00:00
420271ef23
Moving visualization out of landmark detection.
2017-11-11 09:14:45 +00:00
312d9e9608
Fixing scripts with new capture and recorder.
2017-11-10 20:40:59 +00:00
db5b5fceda
Sequence capture fix and landmark vid simplification.
2017-11-10 19:01:43 +00:00
d5a3af7ece
Integrating SequenceCapture to FaceLandmarkVid
2017-11-10 18:49:30 +00:00
e58ccaa73d
Visualization fix, and fix with sequence reading from video files.
2017-11-10 08:57:34 +00:00
4959640b03
Another bugfix with sequence capture.
2017-11-10 07:57:33 +00:00
919c79ce7d
Camera intrinsic setup bug.
2017-11-09 21:04:25 +00:00
d923c96906
A couple of bug fixes for sequence capture.
2017-11-09 20:43:53 +00:00
e22060d073
Getting ready to testing a new sequence recorder.
2017-11-09 19:56:16 +00:00
8ded025baf
More refactorization.
2017-11-09 18:37:26 +00:00
6c14aeab89
Big cleanup for SequenceCapture
2017-11-09 18:25:49 +00:00
53d7d6b78c
Continuing working on sequence capture, leading to quite a big cleanup in FeatuerExtraction.cpp
2017-11-08 21:35:27 +00:00
4b54738b68
More work on sequence capture.
2017-11-08 21:13:02 +00:00
839e1bc738
Working on sequence captures.
2017-11-08 20:50:46 +00:00
75bb688d2c
Sequence capture files added to the project.
2017-11-08 20:22:14 +00:00
a1235efce8
SequenceCapture work.
2017-11-08 20:08:17 +00:00
e8511cd10f
Working on SequenceCapture functionality.
2017-11-08 19:38:37 +00:00
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
71407c9067
isSequence fix.
2017-11-07 07:46:25 +00:00
b37335052c
Fix with sequence recording.
2017-11-06 20:24:04 +00:00
0e428cca45
Work on experiments and experiment scripts, together with recording parameters.
2017-11-05 10:30:40 +00:00
ac96608bfd
Two output bug fixes.
2017-11-05 09:30:56 +00:00
1159caba75
Output similarity aligned faces through recorder.
2017-11-05 08:51:27 +00:00
c80016fc0c
Some recording fixes and cleanup
2017-11-05 08:14:01 +00:00
ca3b252d19
Some more model simplification, only write the header on first write
2017-11-05 07:45:19 +00:00
cb229ad50b
More recorder simplification.
2017-11-04 20:57:24 +00:00
8beb7e58c4
Starting to introduce recording parameters for simplicity.
2017-11-03 21:35:55 +00:00
7f3ed9c855
Towards a big recording simplification.
2017-11-03 20:00:24 +00:00
5ff3d43db9
Project updates
2017-11-03 19:48:11 +00:00
1d8bc8c510
Fixes.
2017-11-03 16:40:07 +00:00
16918e7fb5
More work on recording, getting there
2017-11-03 09:04:00 +00:00
b60669fa62
Continuing work on the recorder.
2017-11-03 08:34:55 +00:00
4f4bf263d6
More work on the recorder.
2017-11-02 20:11:58 +00:00
be5a4cd41d
Small fix for references in class variables.
2017-11-02 09:08:24 +00:00
f00d1fe51e
Working on the recorder interface.
2017-11-02 09:06:53 +00:00
822ade42b9
Working for first incorporation of Recorder to FeatureExtraction
2017-11-01 20:29:57 +00:00
550b325095
Bit more on HOG recording.
2017-11-01 20:03:31 +00:00
32a9ee0a7e
Working on the HOG recorder.
2017-11-01 19:59:23 +00:00
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
0ac039d708
Preparing for processing of image files, and a new image output format.
2017-10-30 09:43:03 +00:00
8d996cce62
Preparing for static AU prediction.
2017-10-30 07:50:33 +00:00
569a81ae39
Bounding box visualization fix for opening image sequences in the GUI.
2017-10-29 10:43:25 +00:00
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
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
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
4b85fe21ac
Reporting a gaze angle that makes more sense.
2017-10-22 10:03:23 +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
e71d13a22a
- some cleanup with depth
2017-10-21 12:15:22 +01:00
1cfb765bb9
Gaze estimation correction with offset, changing world coordinates to be default ones.
2017-10-20 21:59:10 +01:00
f55ad777e1
Some small fixes after the merge.
2017-10-18 03:09:47 -04: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
c6a26861e6
Merge pull request #250 from Lydorn/patch-1
...
Update LandmarkDetectorUtils.cpp
2017-09-19 10:19:43 +01:00
91c3016d1a
Bug fix when -gaze is used.
2017-09-19 10:18:57 +01:00
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
1685a9c6a8
A bug fix with hierarchical models and the multi-view setting.
2017-09-10 12:30:19 +01:00
9a92d4d9c8
Removing legacy CLM-Z models.
2017-08-02 13:39:31 -04:00
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
8eb086545c
Simplified validator model.
2017-07-31 15:55:29 -04:00
7513cf7964
Speeding up fancy face validation.
2017-07-29 21:11:16 -04:00
8cc98be724
First try at a new landmark validator.
2017-07-29 18:19:41 -04:00
a539e73b93
parameters: when fdloc provided, set detector to use HAAR cascade
2017-06-15 11:13:42 +08:00
138c8bd463
add -fdloc for customize face detection/classifier files
2017-06-14 11:46:44 +08: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
788356c685
- Adding proper license
...
- Cleaning up image processing
2017-05-15 14:55:18 -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
15ee31bece
Update LandmarkDetectorModel.cpp
...
Moved eye_model false assignment from header.
2017-02-23 13:46:39 -05:00
86341fae30
Update LandmarkDetectorModel.h
...
Moving default boolean eye model assignment of false to cpp.
2017-02-23 13:45:09 -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
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
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
41fc0bd43c
Unifying input and output of GUI and command line versions.
2016-12-09 15:07:31 -05:00
29d13878da
Towards AU post-processing in the GUI.
2016-12-09 10:06:04 -05:00
99191fd3c9
Simplification of Recording in WPF through a separate file and data binding (WIP).
2016-12-08 16:14:06 -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
Tadas Baltrusaitis