73d8dddbb2
Some bug fixes with visualization.
2017-11-12 11:24:25 +00:00
5ce0a8d4bf
More visualization cleanup and removal of redundant code.
2017-11-12 10:55:47 +00:00
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
e636b4ca7c
Moving shared rotation helpers to utilities, so as not to double code.
2017-11-11 11:57:57 +00:00
db5b5fceda
Sequence capture fix and landmark vid simplification.
2017-11-10 19:01:43 +00:00
d5a3af7ece
Integrating SequenceCapture to FaceLandmarkVid
2017-11-10 18:49:30 +00:00
e58ccaa73d
Visualization fix, and fix with sequence reading from video files.
2017-11-10 08:57:34 +00:00
5f9f2e3a94
A bug fix with aligned face images.
2017-11-09 21:28:35 +00:00
e22060d073
Getting ready to testing a new sequence recorder.
2017-11-09 19:56:16 +00:00
8ded025baf
More refactorization.
2017-11-09 18:37:26 +00:00
6c14aeab89
Big cleanup for SequenceCapture
2017-11-09 18:25:49 +00:00
53d7d6b78c
Continuing working on sequence capture, leading to quite a big cleanup in FeatuerExtraction.cpp
2017-11-08 21:35:27 +00:00
4b54738b68
More work on sequence capture.
2017-11-08 21:13:02 +00:00
839e1bc738
Working on sequence captures.
2017-11-08 20:50:46 +00:00
e8511cd10f
Working on SequenceCapture functionality.
2017-11-08 19:38:37 +00:00
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
b37335052c
Fix with sequence recording.
2017-11-06 20:24:04 +00:00
ab8aaa19ed
Some more simplification.
2017-11-05 09:21:55 +00:00
3b084fa4f3
Some small fixes on recording in feature extraction.
2017-11-05 08:56:25 +00:00
1159caba75
Output similarity aligned faces through recorder.
2017-11-05 08:51:27 +00:00
db1fef46eb
Video output bug fix.
2017-11-05 08:24:42 +00:00
c80016fc0c
Some recording fixes and cleanup
2017-11-05 08:14:01 +00:00
cb229ad50b
More recorder simplification.
2017-11-04 20:57:24 +00:00
7f3ed9c855
Towards a big recording simplification.
2017-11-03 20:00:24 +00:00
1d8bc8c510
Fixes.
2017-11-03 16:40:07 +00:00
16918e7fb5
More work on recording, getting there
2017-11-03 09:04:00 +00:00
b60669fa62
Continuing work on the recorder.
2017-11-03 08:34:55 +00:00
be5a4cd41d
Small fix for references in class variables.
2017-11-02 09:08:24 +00:00
822ade42b9
Working for first incorporation of Recorder to FeatureExtraction
2017-11-01 20:29:57 +00:00
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
a8ec41e91f
Merge remote-tracking branch 'origin/master' into feature/Windows-GUI
...
Conflicts:
exe/FeatureExtraction/FeatureExtraction.cpp
2017-10-29 11:40:52 +00:00
de4e351c65
Performance fix, and feature extraction as video file count fix.
2017-10-29 10:58:56 +00:00
b668facb00
Redefinition of variable fix.
2017-10-28 20:46:22 +01:00
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
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
271c076f41
Merge branch 'develop' into feature/Windows-GUI
2017-10-26 08:06:18 +01:00
ae7497ef09
Fixes for linking to OpenBLAS.
2017-10-25 20:16:37 +01:00
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
85a201c508
OpenBLAS cmake fixes.
2017-10-25 07:40:31 +01:00
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
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
c9061824c5
Adding direct OpenBLAS code for some speedups.
2017-10-23 18:54:02 +01:00
36f12c6d33
Merge branch 'develop' of https://github.com/TadasBaltrusaitis/OpenFace into develop
2017-10-23 17:58:54 +01:00
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
7bbca6c48c
Gaze output correction
2017-10-22 20:55:47 +01:00
729d9a9a85
Adding ability to output eye landmark locations during image processing.
2017-10-22 20:02:54 +01:00
4b85fe21ac
Reporting a gaze angle that makes more sense.
2017-10-22 10:03:23 +01:00
1f356eb8ae
More changes to bring up to speed for GUI:
...
- Outputting gaze angle
- Outputting eye landmarks
2017-10-21 20:40:18 +01:00
e71d13a22a
- some cleanup with depth
2017-10-21 12:15:22 +01:00
1cfb765bb9
Gaze estimation correction with offset, changing world coordinates to be default ones.
2017-10-20 21:59:10 +01:00
f55ad777e1
Some small fixes after the merge.
2017-10-18 03:09:47 -04: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
46bd0869ad
More fine grained visualization during FeatureExtraction, and updating face validation readme.
2017-10-13 08:38:12 +01: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
39d0dac347
Bug fix with writing video file out when -fdir is used for loading video in.
2017-07-25 14:18:45 -04:00
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
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
bd0cebbef0
Merging newest master branch in.
2017-04-14 17:23:51 -04:00
1c546298b8
A small fix for linux compilation.
2017-03-08 14:25:13 -05:00
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
764337e2a1
Disable Key Presses if Quiet Mode Enabled
...
Enables running without OpenCV calling on GTK, which you do not installed if running in a non-interactive manner. Perhaps better solution exist if "interactive" command line was added.
2017-03-05 15:49:01 -05:00
51f442a3e2
Merge pull request #107 from CJxD/develop
...
Fix CMake install process for Unix make install
2017-01-03 14:20:34 -05:00
dbe677db38
Forgot to add fallback define for CONFIG_DIR in FaceLandmarkImg
2016-12-31 16:52:30 +00:00
4260f6a20e
Fix AU and triangulation loading for FaceLandmarkImg and FeatureExtraction
2016-12-29 23:40:03 +00:00
d21921efdd
Include FeatureExtraction in installed bin directory
2016-12-29 23:39:00 +00:00
41fc0bd43c
Unifying input and output of GUI and command line versions.
2016-12-09 15:07:31 -05:00
29d13878da
Towards AU post-processing in the GUI.
2016-12-09 10:06:04 -05:00
99191fd3c9
Simplification of Recording in WPF through a separate file and data binding (WIP).
2016-12-08 16:14:06 -05:00
0befd5f756
Allowing to control the size of aligned output image
2016-12-05 17:28:39 -05:00
984cfb58e7
Adding gaze angle to features and to visualization.
2016-12-02 14:21:24 -05:00
9900e8b0de
Simplifying head pose estimation.
2016-11-23 17:17:26 -05:00
6eb46088f8
Fixing some output bugs for C# and C++ models.
2016-11-23 11:50:33 -05:00
c23db4b5e8
Fixes to camera loading.
2016-10-04 21:14:41 -04:00
11031f5a36
Bug correction: FeatureExtraction file header corrected.
2016-09-16 10:49:18 +02: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
1b804c95b6
Merge branch 'master' into develop
2016-09-06 10:37:03 -04:00
ef15d5c2cd
Getting rid of compiler warnings.
2016-08-14 10:20:07 -04:00
4c2e0bd9a0
Getting rid of some warnings.
2016-08-13 17:56:17 -04:00
a81f1d3223
Merge pull request #39 from Temigo/master
...
Fix install in CMakeLists.txt files
2016-08-04 14:13:33 -04:00
5416048697
Corrections for output, faster compilation in VS2015, retuning experiments.
2016-08-01 13:39:52 -04:00
2f667bf23d
Ubuntu case sensitivity fix in travis test, making sure a check is made to see if image output is successful.
2016-08-01 10:14:58 -04:00
eedf6ea37e
Fix install in CMakeLists.txt files
2016-08-01 11:34:23 +02:00
3fc388cdeb
Fixes with -inroot and -outroot
2016-07-31 20:55:29 -04:00
51ae195124
A number of small fixes, renamings and corrections.
2016-07-31 16:31:17 -04:00
ee15ecbc46
More testing and prettier drawing on images (with anti-aliasing)
2016-07-31 13:11:14 -04:00
0445a97b0c
Merge branch 'feature-travis' into develop
2016-07-31 12:11:35 -04:00
bb7ba5ba60
A fix to a previous fix - OpenCV does not handle Debug/Release mixing with writing out ,jpeg and .png files, so use .bmp instead
2016-07-31 10:09:35 -04:00
a62de100e4
A fix to deal with OpenCV not liking to output png in Debug mode. Feature extraction now saves jpg instead of png for aligned face images.
2016-07-31 09:31:47 -04:00
808a189525
Fixing the project configurations to create consistently named executables.
2016-07-30 21:14:38 -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
f80fbf0b42
Merge branch 'develop'
2016-07-22 13:29:17 -04:00
5d5947a41d
Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace
...
Conflicts:
.gitignore
2016-07-22 12:36:11 -04:00
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
73a28260ec
Update CMakeLists.txt
...
to specify the location of TBB header file
2016-07-11 16:14:36 -04:00
f5ed435e18
Update CMakeLists.txt
...
to specify the location of TBB header file
2016-07-11 16:13:37 -04:00
d9d4b10a52
Update CMakeLists.txt
...
to specify the location of TBB header file
2016-07-11 16:12:34 -04:00
819e087c98
Update CMakeLists.txt
2016-07-11 16:11:02 -04:00
146dcd5e5b
More work on AU - WIP
2016-06-14 17:55:16 -04:00
4a73ece996
Changing project settings to allow for older CPUs without AVX2 instruction set.
2016-06-11 11:57:54 -04:00
Tadas Baltrusaitis