Commit Graph

60 Commits

Author SHA1 Message Date
Tadas Baltrusaitis 6e15e81777 Working towards coping without AU and eye models. Fixes to the visualizer. 2018-03-30 09:36:32 +01:00
Tadas Baltrusaitis b1524ca98b Making sure AU visualization works with other executables. 2018-03-26 08:26:48 +01:00
Tadas Baltrusaitis a4de1d42a5 Interface changes to provide multi output support, also enforcing parameters in executables. 2018-02-23 08:25:19 +00:00
Tadas Baltrusaitis bb7a5f197b Starting the move to OpenCV 3.4 2018-02-01 20:10:10 +00:00
Tadas Baltrusaitis ffe2e66081 Visualization fixes. 2018-01-31 08:23:48 +00:00
Tadas Baltrusaitis 57c8bb75ea Working on the visualizer interoperability. 2018-01-19 16:17:22 +00:00
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 7b039b2e7a Adding images for new wiki entries and some code for packaging releases. 2017-12-28 19:47:49 +00:00
Tadas Baltrusaitis 9470298005 Bringing all of the experiments to a new interface 2017-12-16 13:14:02 +00:00
Tadas Baltrusaitis 7d58b86020 Some plumbing:
- support for 16 bit images
- preventing copy constructors for certain utilities classes
2017-12-15 19:56:58 +00:00
Tadas Baltrusaitis 00bd196197 Adapting Cmake to new interface. 2017-12-13 17:50:48 +00:00
Tadas Baltrusaitis 67041371dd Correct metafile output for webcam. 2017-12-12 17:48:46 +00:00
Tadas Baltrusaitis e629ae50be A number of fixes to the recorder:
- camera parameters in the meta file
- fixing bug with video output
- Relative and full path input in the meta file
2017-12-12 08:55:23 +00:00
Tadas Baltrusaitis 488cd4d92f Bug fixes with image readers. 2017-11-19 20:04:00 +00:00
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 629872cb45 Indentation fix. 2017-11-15 19:57:58 +00:00
Tadas Baltrusaitis d0945694e2 Adding image functionality. 2017-11-15 19:55:16 +00:00
Tadas Baltrusaitis 475f6b9dfa More model simplification, getting there with img. 2017-11-14 20:36:58 +00:00
Tadas Baltrusaitis 553ee9213f Project update 2017-11-14 20:06:59 +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 4b54738b68 More work on sequence capture. 2017-11-08 21:13:02 +00: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 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 85a201c508 OpenBLAS cmake fixes. 2017-10-25 07:40: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 c9061824c5 Adding direct OpenBLAS code for some speedups. 2017-10-23 18:54:02 +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 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 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 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
Chris Watts dbe677db38 Forgot to add fallback define for CONFIG_DIR in FaceLandmarkImg 2016-12-31 16:52:30 +00:00
Chris Watts 4260f6a20e Fix AU and triangulation loading for FaceLandmarkImg and FeatureExtraction 2016-12-29 23:40:03 +00:00
Tadas Baltrusaitis 9900e8b0de Simplifying head pose estimation. 2016-11-23 17:17:26 -05:00
Tadas Baltrusaitis c23db4b5e8 Fixes to camera loading. 2016-10-04 21:14:41 -04:00
Tadas Baltrusaitis 1b804c95b6 Merge branch 'master' into develop 2016-09-06 10:37:03 -04:00
Tadas Baltrusaitis 4c2e0bd9a0 Getting rid of some warnings. 2016-08-13 17:56:17 -04:00
Tadas Baltrusaitis a81f1d3223 Merge pull request #39 from Temigo/master
Fix install in CMakeLists.txt files
2016-08-04 14:13:33 -04:00
Tadas Baltrusaitis 5416048697 Corrections for output, faster compilation in VS2015, retuning experiments. 2016-08-01 13:39:52 -04:00