Commit Graph

105 Commits

Author SHA1 Message Date
Tadas Baltrusaitis 4707b0a687 Some more script fixes. 2017-11-07 07:25:44 +00:00
Tadas Baltrusaitis 0e428cca45 Work on experiments and experiment scripts, together with recording parameters. 2017-11-05 10:30:40 +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 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 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 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 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 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 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 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 91c3016d1a Bug fix when -gaze is used. 2017-09-19 10:18:57 +01: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 8eb086545c Simplified validator model. 2017-07-31 15:55:29 -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 6e8de1706c A matlab compatibility fix. 2017-05-09 16:06:55 -04:00
Tadas Baltrusaitis 69de6fb83d Another fix for renaming and relocating sample images. 2017-05-09 12:20:10 -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 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 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
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 41fc0bd43c Unifying input and output of GUI and command line versions. 2016-12-09 15:07:31 -05:00
Tadas Baltrusaitis 29d13878da Towards AU post-processing in the GUI. 2016-12-09 10:06:04 -05:00
Tadas Baltrusaitis 99191fd3c9 Simplification of Recording in WPF through a separate file and data binding (WIP). 2016-12-08 16:14:06 -05:00
Tadas Baltrusaitis ee48946818 Slightly better gaze estimation for off axis images. 2016-12-07 10:00:17 -05:00
Tadas Baltrusaitis 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
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 0befd5f756 Allowing to control the size of aligned output image 2016-12-05 17:28:39 -05:00
Tadas Baltrusaitis 984cfb58e7 Adding gaze angle to features and to visualization. 2016-12-02 14:21:24 -05:00
Tadas Baltrusaitis 04afc144f7 Rerunning experiments with the new head pose setup. 2016-11-28 10:53:03 -05:00
Tadas Baltrusaitis 9900e8b0de Simplifying head pose estimation. 2016-11-23 17:17:26 -05:00
Tadas Baltrusaitis 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
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 51ae195124 A number of small fixes, renamings and corrections. 2016-07-31 16:31:17 -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
Tadas Baltrusaitis 146dcd5e5b More work on AU - WIP 2016-06-14 17:55:16 -04:00
Tadas Baltrusaitis b75f12f078 Static res 2016-06-03 16:32:45 -04:00
Tadas Baltrusaitis 27641add77 Cleaning up and adding AU training - WIP 2016-06-03 09:33:04 -04:00
Tadas Baltrusaitis 803575d5b7 More work at establishing AU baselines on SEMAINE and BP4D datasets. 2016-05-24 16:51:18 -04:00
Tadas Baltrusaitis e6e547b0a1 GUI initial work (WIP) 2016-05-20 16:48:43 -04:00
unknown 7eb6f264f4 Updated .gitignore file, small renaming fix for executable. 2016-04-28 18:15:39 -04:00
unknown 57e58a6949 Master commit of OpenFace. 2016-04-28 15:40:36 -04:00