Commit Graph

39 Commits

Author SHA1 Message Date
Tadas Baltrusaitis 96ee923da7 AU training code adaptation to the new interface and testing. 2018-02-27 21:09:09 +00:00
Tadas Baltrusaitis 82f57d90ae adapting experiments for landmarks. 2018-02-25 11:51:12 +00:00
Tadas Baltrusaitis 2d5473adc5 Results with the new OCV 2018-02-05 18:36:00 +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 5add8bc1df Results with the new setup. 2017-12-28 17:41:25 +00:00
Tadas Baltrusaitis b1a515716c Adapting experiments to run on Ubuntu as well. 2017-12-18 12:17:53 +00:00
Tadas Baltrusaitis 9470298005 Bringing all of the experiments to a new interface 2017-12-16 13:14:02 +00:00
Tadas Baltrusaitis 77cf256dc3 Back to good results on landmarks with new interface. 2017-11-24 21:31:41 +00:00
Tadas Baltrusaitis fc8fe65f78 Working towards image landmark detection experiments with the new interface. 2017-11-24 20:11:45 +00:00
Tadas Baltrusaitis a224c10775 Output tracked uses up too much space, maybe need to output as jpg's 2017-11-24 08:06:03 +00:00
Tadas Baltrusaitis 681e6b9b58 Work on image experiments using the new interface. 2017-11-24 07:47:50 +00:00
Tadas Baltrusaitis a70fe65356 Another small fix. 2017-11-22 20:21:59 +00:00
Tadas Baltrusaitis 488cd4d92f Bug fixes with image readers. 2017-11-19 20:04:00 +00:00
Tadas Baltrusaitis 974cee63b9 Fixes for loading images with new interface. 2017-11-18 21:08:43 +00:00
Tadas Baltrusaitis 475f6b9dfa More model simplification, getting there with img. 2017-11-14 20:36:58 +00:00
Tadas Baltrusaitis a87377d70e Another fix for adapting the new interface experiments. 2017-11-14 20:23:02 +00:00
Tadas Baltrusaitis c547b380b6 Clearer error reporting. 2017-11-14 20:19:11 +00:00
Tadas Baltrusaitis 726cca5d59 Updating another script with a new interface. 2017-11-14 20:04:30 +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 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 e71d13a22a - some cleanup with depth 2017-10-21 12:15:22 +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 c7f0e5e926 Newest results. 2017-09-11 08:03:29 +01: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 ba1e55abe7 Confirming the experiments still run and results are correct. 2017-04-17 08:53:48 -04:00
Tadas Baltrusaitis bd0cebbef0 Merging newest master branch in. 2017-04-14 17:23:51 -04:00
Tadas Baltrusaitis bfe3d2dc98 Correcting the naming of result display. 2017-04-14 16:55:18 -04:00
Tadas Baltrusaitis 8054577710 Making sure the full set of experiments can run on both unix and Windows machines and that the results are the same. 2017-01-05 11:24:39 -05:00
Unknown 1b13794a47 Ability to run the full experiment suite in unix 2017-01-04 17:32:38 -05:00
Tadas Baltrusaitis 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
Tadas Baltrusaitis 29d13878da Towards AU post-processing in the GUI. 2016-12-09 10:06:04 -05:00
Tadas Baltrusaitis 6499412259 Adding output folder selection (trickier that it sounds due to lack of native WPF support) 2016-12-06 10:03:04 -05:00
Tadas Baltrusaitis 04afc144f7 Rerunning experiments with the new head pose setup. 2016-11-28 10:53:03 -05:00
Tadas Baltrusaitis c1ff40399e Bug fixes 2016-09-06 12:32:33 -04:00
Tadas Baltrusaitis 5416048697 Corrections for output, faster compilation in VS2015, retuning experiments. 2016-08-01 13:39:52 -04:00
Tadas Baltrusaitis 3a9a17d5fd Some cleanup and making sure all the tests run on Windows 2016-07-22 11:28:45 -04:00
Tadas Baltrusaitis 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
unknown 57e58a6949 Master commit of OpenFace. 2016-04-28 15:40:36 -04:00