Commit Graph

45 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 5ed6c4a6f3 Starting integration of AU visualization in CLI code. 2018-03-24 10:30:30 +00:00
Tadas Baltrusaitis 4192e85a8f Some refinements for the multi face tracking support and cmake fixes. 2018-02-24 09:19:13 +00:00
Tadas Baltrusaitis 8692b5f9a8 - nomask works in gui now
- llowing to set camera resolution in CLI.
2018-02-08 16:28:00 +00:00
Tadas Baltrusaitis 0c55fb9d80 Better organization of OpenCV dll's and packaging script for releases. 2018-02-05 18:14:36 +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 00bd196197 Adapting Cmake to new interface. 2017-12-13 17:50:48 +00:00
Tadas Baltrusaitis 89332ea943 More bug fixes revealed by demo scripts. 2017-11-22 17:53:15 +00:00
Tadas Baltrusaitis 41af428f5c Fix with reading multiple sequences and visualizing data in multi-face setting. 2017-11-22 17:37:26 +00:00
Tadas Baltrusaitis 7e16619529 Bug fix in opening video sequences revealed by a demo script. 2017-11-22 09:03:29 +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 6500865a0b Code cleanup with visualization. 2017-11-14 07:54:02 +00:00
Tadas Baltrusaitis 32862c32f4 Visualization fixes for demo executables. 2017-11-13 19:48:48 +00:00
Tadas Baltrusaitis fa75910b6c Updating multi-face setup with the new interface. 2017-11-13 17:48:17 +00:00
Tadas Baltrusaitis 9f4bf5724f Simplifying the visualizer and using it in FaceLandmarkVid 2017-11-13 17:30:19 +00:00
Tadas Baltrusaitis db5b5fceda Sequence capture fix and landmark vid simplification. 2017-11-10 19:01:43 +00:00
Tadas Baltrusaitis d5a3af7ece Integrating SequenceCapture to FaceLandmarkVid 2017-11-10 18:49:30 +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 ae7497ef09 Fixes for linking to OpenBLAS. 2017-10-25 20:16:37 +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 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 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
Guillaume Chanel 358cd6f9e2 Added the possibility to change the output videos codec by specifying the -oc option
A warning is now issued in the case the VideoWriter could not be instantiated, advising to change the codec
This change applies to FaceLandmarkVid* and FeatureExtraction executables
The option is used as "-oc CODEC_FOURCC" and defaults to DIVX. If the user inputs a FOURCC with a size different than 4, than the default codec is used
The option is handled by the function get_video_input_output_params in the LandMarkDetector namespace
2016-09-14 09:00:57 +02: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
Temigo eedf6ea37e Fix install in CMakeLists.txt files 2016-08-01 11:34:23 +02:00
Tadas Baltrusaitis 0445a97b0c Merge branch 'feature-travis' into develop 2016-07-31 12:11:35 -04:00
Tadas Baltrusaitis 808a189525 Fixing the project configurations to create consistently named executables. 2016-07-30 21:14:38 -04:00
Tadas Baltrusaitis 242ce8d130 Making sure failure returns 1 and success 0, adding an initial attempt at AppVeyor CI for Windows. 2016-07-29 13:04:25 -04:00
simonmssu d9d4b10a52 Update CMakeLists.txt
to specify the location of TBB header file
2016-07-11 16:12:34 -04:00
Tadas Baltrusaitis 4a73ece996 Changing project settings to allow for older CPUs without AVX2 instruction set. 2016-06-11 11:57:54 -04:00
unknown 57e58a6949 Master commit of OpenFace. 2016-04-28 15:40:36 -04:00