Commit graph

464 commits

Author SHA1 Message Date
Tadas Baltrusaitis
ac96608bfd Two output bug fixes. 2017-11-05 09:30:56 +00:00
Tadas Baltrusaitis
ab8aaa19ed Some more simplification. 2017-11-05 09:21:55 +00:00
Tadas Baltrusaitis
3b084fa4f3 Some small fixes on recording in feature extraction. 2017-11-05 08:56:25 +00:00
Tadas Baltrusaitis
1159caba75 Output similarity aligned faces through recorder. 2017-11-05 08:51:27 +00:00
Tadas Baltrusaitis
db1fef46eb Video output bug fix. 2017-11-05 08:24:42 +00:00
Tadas Baltrusaitis
c80016fc0c Some recording fixes and cleanup 2017-11-05 08:14:01 +00:00
Tadas Baltrusaitis
ca3b252d19 Some more model simplification, only write the header on first write 2017-11-05 07:45:19 +00:00
Tadas Baltrusaitis
cb229ad50b More recorder simplification. 2017-11-04 20:57:24 +00:00
Tadas Baltrusaitis
8beb7e58c4 Starting to introduce recording parameters for simplicity. 2017-11-03 21:35:55 +00:00
Tadas Baltrusaitis
7f3ed9c855 Towards a big recording simplification. 2017-11-03 20:00:24 +00:00
Tadas Baltrusaitis
5ff3d43db9 Project updates 2017-11-03 19:48:11 +00:00
Tadas Baltrusaitis
1d8bc8c510 Fixes. 2017-11-03 16:40:07 +00:00
Tadas Baltrusaitis
16918e7fb5 More work on recording, getting there 2017-11-03 09:04:00 +00:00
Tadas Baltrusaitis
b60669fa62 Continuing work on the recorder. 2017-11-03 08:34:55 +00:00
Tadas Baltrusaitis
4f4bf263d6 More work on the recorder. 2017-11-02 20:11:58 +00:00
Tadas Baltrusaitis
be5a4cd41d Small fix for references in class variables. 2017-11-02 09:08:24 +00:00
Tadas Baltrusaitis
f00d1fe51e Working on the recorder interface. 2017-11-02 09:06:53 +00:00
Tadas Baltrusaitis
822ade42b9 Working for first incorporation of Recorder to FeatureExtraction 2017-11-01 20:29:57 +00:00
Tadas Baltrusaitis
550b325095 Bit more on HOG recording. 2017-11-01 20:03:31 +00:00
Tadas Baltrusaitis
32a9ee0a7e Working on the HOG recorder. 2017-11-01 19:59:23 +00:00
Tadas Baltrusaitis
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
Tadas Baltrusaitis
0ac039d708 Preparing for processing of image files, and a new image output format. 2017-10-30 09:43:03 +00:00
Tadas Baltrusaitis
8d996cce62 Preparing for static AU prediction. 2017-10-30 07:50:33 +00:00
Tadas Baltrusaitis
a8ec41e91f Merge remote-tracking branch 'origin/master' into feature/Windows-GUI
Conflicts:
	exe/FeatureExtraction/FeatureExtraction.cpp
2017-10-29 11:40:52 +00:00
Tadas Baltrusaitis
de4e351c65 Performance fix, and feature extraction as video file count fix. 2017-10-29 10:58:56 +00:00
Tadas Baltrusaitis
569a81ae39 Bounding box visualization fix for opening image sequences in the GUI. 2017-10-29 10:43:25 +00:00
Tadas Baltrusaitis
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
Tadas Baltrusaitis
b668facb00 Redefinition of variable fix. 2017-10-28 20:46:22 +01: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
087202a5b3 removing old dep. 2017-10-26 15:21: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
ae7497ef09 Fixes for linking to OpenBLAS. 2017-10-25 20:16:37 +01:00
Tadas Baltrusaitis
0980b1587c Another attempt to resolve the include issues for gcc. 2017-10-25 19:32:36 +01:00
Tadas Baltrusaitis
3a3b375197 Another attempt at a fix. 2017-10-25 19:13:47 +01:00
Tadas Baltrusaitis
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
Tadas Baltrusaitis
ea370ae43f A fix for unix compilation. 2017-10-25 17:04:28 +01:00
Tadas Baltrusaitis
9356344e91 Another missing include for cmake. 2017-10-25 08:39:38 +01:00
Tadas Baltrusaitis
85a201c508 OpenBLAS cmake fixes. 2017-10-25 07:40:31 +01:00
Tadas Baltrusaitis
7c98f6f378 Merge remote-tracking branch 'origin/develop' into feature/Windows-GUI 2017-10-24 16:28: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
863b62adb8 Fixes to cmake with new face analyser separation. 2017-10-24 07:57:49 +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
c9061824c5 Adding direct OpenBLAS code for some speedups. 2017-10-23 18:54:02 +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
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