Commit graph

104 commits

Author SHA1 Message Date
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
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
ea0f658190 Dealing better with non-tracked frames. 2017-11-25 10:12:34 +00:00
Tadas Baltrusaitis
c5749cc3ba Dealing better with online mode in feature extraction. 2017-11-25 09:22:34 +00:00
Tadas Baltrusaitis
21bdf03801 More patches and small fixes for recording and visualization. 2017-11-24 17:16:15 +00:00
Tadas Baltrusaitis
89332ea943 More bug fixes revealed by demo scripts. 2017-11-22 17:53:15 +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
9f4bf5724f Simplifying the visualizer and using it in FaceLandmarkVid 2017-11-13 17:30:19 +00:00
Tadas Baltrusaitis
fa48372f4c Adding a dedicated FPS tracker. 2017-11-13 09:07:52 +00:00
Tadas Baltrusaitis
bee6d185cb Some more bug fixes with visualization and recording. Creating a metafile for recorded data. 2017-11-12 21:40:30 +00:00
Tadas Baltrusaitis
fd4d06166a Better gaze visualization. 2017-11-12 13:26:51 +00:00
Tadas Baltrusaitis
73d8dddbb2 Some bug fixes with visualization. 2017-11-12 11:24:25 +00:00
Tadas Baltrusaitis
5ce0a8d4bf More visualization cleanup and removal of redundant code. 2017-11-12 10:55:47 +00:00
Tadas Baltrusaitis
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
Tadas Baltrusaitis
e636b4ca7c Moving shared rotation helpers to utilities, so as not to double code. 2017-11-11 11:57:57 +00:00
Tadas Baltrusaitis
e58ccaa73d Visualization fix, and fix with sequence reading from video files. 2017-11-10 08:57:34 +00:00
Tadas Baltrusaitis
5f9f2e3a94 A bug fix with aligned face images. 2017-11-09 21:28:35 +00:00
Tadas Baltrusaitis
e22060d073 Getting ready to testing a new sequence recorder. 2017-11-09 19:56:16 +00:00
Tadas Baltrusaitis
8ded025baf More refactorization. 2017-11-09 18:37:26 +00:00
Tadas Baltrusaitis
6c14aeab89 Big cleanup for SequenceCapture 2017-11-09 18:25:49 +00:00
Tadas Baltrusaitis
53d7d6b78c Continuing working on sequence capture, leading to quite a big cleanup in FeatuerExtraction.cpp 2017-11-08 21:35:27 +00:00
Tadas Baltrusaitis
839e1bc738 Working on sequence captures. 2017-11-08 20:50:46 +00:00
Tadas Baltrusaitis
e8511cd10f Working on SequenceCapture functionality. 2017-11-08 19:38:37 +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
b37335052c Fix with sequence recording. 2017-11-06 20:24:04 +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
cb229ad50b More recorder simplification. 2017-11-04 20:57:24 +00:00
Tadas Baltrusaitis
7f3ed9c855 Towards a big recording simplification. 2017-11-03 20:00:24 +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
be5a4cd41d Small fix for references in class variables. 2017-11-02 09:08:24 +00:00
Tadas Baltrusaitis
822ade42b9 Working for first incorporation of Recorder to FeatureExtraction 2017-11-01 20:29:57 +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
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
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
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
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