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
e71d13a22a
- some cleanup with depth
2017-10-21 12:15:22 +01:00
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
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
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
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
9900e8b0de
Simplifying head pose estimation.
2016-11-23 17:17:26 -05:00
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
ee15ecbc46
More testing and prettier drawing on images (with anti-aliasing)
2016-07-31 13:11:14 -04:00
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
57e58a6949
Master commit of OpenFace.
2016-04-28 15:40:36 -04:00
Tadas Baltrusaitis