From d998cb0d684e1995299b2ac62c40d0c9699d1341 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Mon, 28 May 2018 18:58:06 +0100 Subject: [PATCH 01/16] Changing AU scripts to avoid a potential race condition with directory creation. --- .gitignore | 4 ++++ .../Action Unit Experiments/run_AU_prediction_BP4D.m | 5 ++++- .../Action Unit Experiments/run_AU_prediction_Bosphorus.m | 5 ++++- .../Action Unit Experiments/run_AU_prediction_DISFA.m | 7 +++++-- .../Action Unit Experiments/run_AU_prediction_FERA2011.m | 5 ++++- .../Action Unit Experiments/run_AU_prediction_SEMAINE.m | 5 ++++- .../Action Unit Experiments/run_AU_prediction_UNBC.m | 2 +- 7 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index fe45cee4..0bc69d61 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,7 @@ matlab_runners/Demos/processed/ exe/releases/OpenFace_* *.suo .vs/OpenFace/v15/ + +build/ + +matlab_runners/Action Unit Experiments/AU_predictions/ diff --git a/matlab_runners/Action Unit Experiments/run_AU_prediction_BP4D.m b/matlab_runners/Action Unit Experiments/run_AU_prediction_BP4D.m index e2a67675..a60c3040 100644 --- a/matlab_runners/Action Unit Experiments/run_AU_prediction_BP4D.m +++ b/matlab_runners/Action Unit Experiments/run_AU_prediction_BP4D.m @@ -2,7 +2,10 @@ clear find_BP4D; BP4D_dir = [BP4D_dir, '../BP4D-training/']; -out_loc = './out_bp4d/'; +out_loc = './AU_predictions/out_bp4d/'; +if(~exist(out_loc, 'file')) + mkdir(out_loc); +end %% if(isunix) diff --git a/matlab_runners/Action Unit Experiments/run_AU_prediction_Bosphorus.m b/matlab_runners/Action Unit Experiments/run_AU_prediction_Bosphorus.m index 9bf13746..678573bb 100644 --- a/matlab_runners/Action Unit Experiments/run_AU_prediction_Bosphorus.m +++ b/matlab_runners/Action Unit Experiments/run_AU_prediction_Bosphorus.m @@ -5,7 +5,10 @@ clear addpath('./helpers'); find_Bosphorus; -out_loc = './out_bosph/'; +out_loc = './AU_predictions/out_bosph/'; +if(~exist(out_loc, 'file')) + mkdir(out_loc); +end %% if(isunix) diff --git a/matlab_runners/Action Unit Experiments/run_AU_prediction_DISFA.m b/matlab_runners/Action Unit Experiments/run_AU_prediction_DISFA.m index 06ca437d..a412dedc 100644 --- a/matlab_runners/Action Unit Experiments/run_AU_prediction_DISFA.m +++ b/matlab_runners/Action Unit Experiments/run_AU_prediction_DISFA.m @@ -21,7 +21,10 @@ end videos = dir([DISFA_dir, '*.avi']); -output = 'out_DISFA/'; +output = './AU_predictions/out_DISFA/'; +if(~exist(output, 'file')) + mkdir(output); +end %% for v = 1:numel(videos) @@ -44,7 +47,7 @@ end % results but rather to show how to do AU prediction and how to interpret % the results Label_dir = [DISFA_dir, '/../ActionUnit_Labels/']; -prediction_dir = 'out_DISFA/'; +prediction_dir = output; label_folders = dir([Label_dir, 'SN*']); diff --git a/matlab_runners/Action Unit Experiments/run_AU_prediction_FERA2011.m b/matlab_runners/Action Unit Experiments/run_AU_prediction_FERA2011.m index 5db47d4f..89e82f07 100644 --- a/matlab_runners/Action Unit Experiments/run_AU_prediction_FERA2011.m +++ b/matlab_runners/Action Unit Experiments/run_AU_prediction_FERA2011.m @@ -3,7 +3,10 @@ clear addpath(genpath('helpers/')); find_FERA2011; -out_loc = './out_fera/'; +out_loc = './AU_predictions/out_fera/'; +if(~exist(out_loc, 'file')) + mkdir(out_loc); +end %% if(isunix) diff --git a/matlab_runners/Action Unit Experiments/run_AU_prediction_SEMAINE.m b/matlab_runners/Action Unit Experiments/run_AU_prediction_SEMAINE.m index 6bcefc76..8a5ca5cd 100644 --- a/matlab_runners/Action Unit Experiments/run_AU_prediction_SEMAINE.m +++ b/matlab_runners/Action Unit Experiments/run_AU_prediction_SEMAINE.m @@ -3,7 +3,10 @@ clear addpath(genpath('helpers/')); find_SEMAINE; -out_loc = './out_SEMAINE/'; +out_loc = './AU_predictions/out_SEMAINE/'; +if(~exist(out_loc, 'file')) + mkdir(out_loc); +end if(isunix) executable = '"../../build/bin/FeatureExtraction"'; diff --git a/matlab_runners/Action Unit Experiments/run_AU_prediction_UNBC.m b/matlab_runners/Action Unit Experiments/run_AU_prediction_UNBC.m index c6fbd8b3..ba65ae25 100644 --- a/matlab_runners/Action Unit Experiments/run_AU_prediction_UNBC.m +++ b/matlab_runners/Action Unit Experiments/run_AU_prediction_UNBC.m @@ -2,7 +2,7 @@ clear unbc_loc = 'D:/Datasets/UNBC/Images/'; -out_loc = './out_unbc/'; +out_loc = './AU_predictions/out_unbc/'; if(~exist(out_loc, 'dir')) mkdir(out_loc); From cdecf902cd1f4facc879b5e912bc249389e57c62 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Tue, 29 May 2018 18:03:26 +0100 Subject: [PATCH 02/16] Updating licensing in source code files. More thorough travis tests. --- .travis.yml | 7 ++- exe/FaceLandmarkImg/FaceLandmarkImg.cpp | 16 +++--- exe/FaceLandmarkVid/FaceLandmarkVid.cpp | 16 +++--- .../FaceLandmarkVidMulti.cpp | 16 +++--- exe/FeatureExtraction/FeatureExtraction.cpp | 16 +++--- exe/Recording/Record.cpp | 16 +++--- gui/HeadPose-live/Liability.xaml.cs | 16 +++--- gui/HeadPose-live/MainWindow.xaml.cs | 16 +++--- gui/HeadPose-live/TextEntryWindow.xaml.cs | 16 +++--- gui/OpenFaceDemo/MainWindow.xaml.cs | 16 +++--- gui/OpenFaceOffline/FpsTracker.cs | 16 +++--- gui/OpenFaceOffline/MainWindow.xaml.cs | 16 +++--- lib/local/CppInerop/AssemblyInfo.cpp | 16 +++--- lib/local/CppInerop/CppInterop.cpp | 16 +++--- lib/local/CppInerop/FaceAnalyserInterop.h | 16 +++--- lib/local/CppInerop/FaceDetectorInterop.h | 16 +++--- lib/local/CppInerop/GazeAnalyserInterop.h | 16 +++--- lib/local/CppInerop/ImageReader.h | 16 +++--- lib/local/CppInerop/LandmarkDetectorInterop.h | 16 +++--- lib/local/CppInerop/OpenCVWrappers.h | 16 +++--- lib/local/CppInerop/RecorderInterop.h | 16 +++--- lib/local/CppInerop/SequenceReader.h | 16 +++--- lib/local/CppInerop/VisualizerInterop.h | 16 +++--- lib/local/FaceAnalyser/include/FaceAnalyser.h | 16 +++--- .../include/FaceAnalyserParameters.h | 16 +++--- lib/local/FaceAnalyser/include/Face_utils.h | 16 +++--- .../FaceAnalyser/include/SVM_dynamic_lin.h | 16 +++--- .../FaceAnalyser/include/SVM_static_lin.h | 16 +++--- .../include/SVR_dynamic_lin_regressors.h | 16 +++--- .../include/SVR_static_lin_regressors.h | 16 +++--- lib/local/FaceAnalyser/src/FaceAnalyser.cpp | 16 +++--- .../src/FaceAnalyserParameters.cpp | 16 +++--- lib/local/FaceAnalyser/src/Face_utils.cpp | 16 +++--- .../FaceAnalyser/src/SVM_dynamic_lin.cpp | 16 +++--- lib/local/FaceAnalyser/src/SVM_static_lin.cpp | 16 +++--- .../src/SVR_dynamic_lin_regressors.cpp | 16 +++--- .../src/SVR_static_lin_regressors.cpp | 16 +++--- .../GazeAnalyser/include/GazeEstimation.h | 16 +++--- lib/local/GazeAnalyser/src/GazeEstimation.cpp | 16 +++--- .../include/CCNF_patch_expert.h | 16 +++--- .../include/CEN_patch_expert.h | 16 +++--- .../LandmarkDetector/include/CNN_utils.h | 16 +++--- .../include/FaceDetectorMTCNN.h | 55 +++++-------------- .../include/LandmarkCoreIncludes.h | 16 +++--- .../include/LandmarkDetectionValidator.h | 54 +++++------------- .../include/LandmarkDetectorFunc.h | 16 +++--- .../include/LandmarkDetectorModel.h | 16 +++--- .../include/LandmarkDetectorParameters.h | 16 +++--- .../include/LandmarkDetectorUtils.h | 16 +++--- lib/local/LandmarkDetector/include/PAW.h | 16 +++--- lib/local/LandmarkDetector/include/PDM.h | 16 +++--- .../LandmarkDetector/include/Patch_experts.h | 16 +++--- .../include/SVR_patch_expert.h | 16 +++--- .../src/CCNF_patch_expert.cpp | 16 +++--- .../LandmarkDetector/src/CEN_patch_expert.cpp | 54 +++++------------- lib/local/LandmarkDetector/src/CNN_utils.cpp | 16 +++--- .../src/FaceDetectorMTCNN.cpp | 54 +++++------------- .../src/LandmarkDetectionValidator.cpp | 54 +++++------------- .../src/LandmarkDetectorFunc.cpp | 16 +++--- .../src/LandmarkDetectorModel.cpp | 16 +++--- .../src/LandmarkDetectorParameters.cpp | 16 +++--- .../src/LandmarkDetectorUtils.cpp | 16 +++--- lib/local/LandmarkDetector/src/PAW.cpp | 16 +++--- lib/local/LandmarkDetector/src/PDM.cpp | 16 +++--- .../LandmarkDetector/src/Patch_experts.cpp | 16 +++--- .../LandmarkDetector/src/SVR_patch_expert.cpp | 16 +++--- lib/local/Utilities/include/ImageCapture.h | 16 +++--- .../include/ImageManipulationHelpers.h | 16 +++--- lib/local/Utilities/include/RecorderCSV.h | 16 +++--- lib/local/Utilities/include/RecorderHOG.h | 16 +++--- .../Utilities/include/RecorderOpenFace.h | 16 +++--- .../include/RecorderOpenFaceParameters.h | 16 +++--- lib/local/Utilities/include/RotationHelpers.h | 16 +++--- lib/local/Utilities/include/SequenceCapture.h | 16 +++--- .../Utilities/include/VisualizationUtils.h | 16 +++--- lib/local/Utilities/include/Visualizer.h | 16 +++--- lib/local/Utilities/src/ImageCapture.cpp | 16 +++--- lib/local/Utilities/src/RecorderCSV.cpp | 16 +++--- lib/local/Utilities/src/RecorderHOG.cpp | 16 +++--- lib/local/Utilities/src/RecorderOpenFace.cpp | 16 +++--- .../src/RecorderOpenFaceParameters.cpp | 16 +++--- lib/local/Utilities/src/SequenceCapture.cpp | 16 +++--- .../Utilities/src/VisualizationUtils.cpp | 16 +++--- lib/local/Utilities/src/Visualizer.cpp | 16 +++--- 84 files changed, 704 insertions(+), 822 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1bdf3d8d..2e221aa4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,6 +81,9 @@ script: - make -j4 - export OMP_NUM_THREADS=1 - export VECLIB_MAXIMUM_THREADS=1 - - ../build/bin/FaceLandmarkImg -f ../samples/sample1.jpg -f ../samples/sample3.jpg -out_dir data -multi_view 1 -wild -q + - ../build/bin/FaceLandmarkImg -fdir ../samples -out_dir data -multi_view 1 -wild -q + - ../build/bin/FaceLandmarkImg -fdir ../samples/sample1.jpg -out_dir data -multi_view 1 -wild -q - ../build/bin/FeatureExtraction -fdir "../samples/image_sequence" -out_dir output -q - - ../build/bin/FaceLandmarkVidMulti -fdir ../samples/image_sequence -q -mloc model/main_clm_general.txt \ No newline at end of file + - ../build/bin/FeatureExtraction -f "../samples/2015-10-15-15-14.avi" -q + - ../build/bin/FaceLandmarkVidMulti -fdir ../samples/image_sequence -q -mloc model/main_clm_general.txt + - ../build/bin/FaceLandmarkVidMulti -f ../samples/multi_face.avi -q -mloc model/main_clnf_general.txt \ No newline at end of file diff --git a/exe/FaceLandmarkImg/FaceLandmarkImg.cpp b/exe/FaceLandmarkImg/FaceLandmarkImg.cpp index e98bd1f4..3dbb6fb3 100644 --- a/exe/FaceLandmarkImg/FaceLandmarkImg.cpp +++ b/exe/FaceLandmarkImg/FaceLandmarkImg.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// // FaceLandmarkImg.cpp : Defines the entry point for the console application for detecting landmarks in images. diff --git a/exe/FaceLandmarkVid/FaceLandmarkVid.cpp b/exe/FaceLandmarkVid/FaceLandmarkVid.cpp index 4599931e..249b11ea 100644 --- a/exe/FaceLandmarkVid/FaceLandmarkVid.cpp +++ b/exe/FaceLandmarkVid/FaceLandmarkVid.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// // FaceTrackingVid.cpp : Defines the entry point for the console application for tracking faces in videos. diff --git a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp index 2da12471..423d368a 100644 --- a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp +++ b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// diff --git a/exe/FeatureExtraction/FeatureExtraction.cpp b/exe/FeatureExtraction/FeatureExtraction.cpp index e5479e04..ea8ed476 100644 --- a/exe/FeatureExtraction/FeatureExtraction.cpp +++ b/exe/FeatureExtraction/FeatureExtraction.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// diff --git a/exe/Recording/Record.cpp b/exe/Recording/Record.cpp index 4b10611a..c0c8f946 100644 --- a/exe/Recording/Record.cpp +++ b/exe/Recording/Record.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// // Record.cpp : A useful function for quick recording from a webcam for test purposes diff --git a/gui/HeadPose-live/Liability.xaml.cs b/gui/HeadPose-live/Liability.xaml.cs index 74e3d902..0ec666c2 100644 --- a/gui/HeadPose-live/Liability.xaml.cs +++ b/gui/HeadPose-live/Liability.xaml.cs @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// using System; diff --git a/gui/HeadPose-live/MainWindow.xaml.cs b/gui/HeadPose-live/MainWindow.xaml.cs index e45e6212..04d722da 100644 --- a/gui/HeadPose-live/MainWindow.xaml.cs +++ b/gui/HeadPose-live/MainWindow.xaml.cs @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// using System; diff --git a/gui/HeadPose-live/TextEntryWindow.xaml.cs b/gui/HeadPose-live/TextEntryWindow.xaml.cs index ab86839a..e4769889 100644 --- a/gui/HeadPose-live/TextEntryWindow.xaml.cs +++ b/gui/HeadPose-live/TextEntryWindow.xaml.cs @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// using System; diff --git a/gui/OpenFaceDemo/MainWindow.xaml.cs b/gui/OpenFaceDemo/MainWindow.xaml.cs index a897f33a..4f374c75 100644 --- a/gui/OpenFaceDemo/MainWindow.xaml.cs +++ b/gui/OpenFaceDemo/MainWindow.xaml.cs @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// using System; diff --git a/gui/OpenFaceOffline/FpsTracker.cs b/gui/OpenFaceOffline/FpsTracker.cs index 1aea29b6..18ad00b1 100644 --- a/gui/OpenFaceOffline/FpsTracker.cs +++ b/gui/OpenFaceOffline/FpsTracker.cs @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// using System; diff --git a/gui/OpenFaceOffline/MainWindow.xaml.cs b/gui/OpenFaceOffline/MainWindow.xaml.cs index 1531c357..39e319ff 100644 --- a/gui/OpenFaceOffline/MainWindow.xaml.cs +++ b/gui/OpenFaceOffline/MainWindow.xaml.cs @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// using System; diff --git a/lib/local/CppInerop/AssemblyInfo.cpp b/lib/local/CppInerop/AssemblyInfo.cpp index 727e6213..def6a0cd 100644 --- a/lib/local/CppInerop/AssemblyInfo.cpp +++ b/lib/local/CppInerop/AssemblyInfo.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// using namespace System; diff --git a/lib/local/CppInerop/CppInterop.cpp b/lib/local/CppInerop/CppInterop.cpp index 8831f448..1e9fbe53 100644 --- a/lib/local/CppInerop/CppInterop.cpp +++ b/lib/local/CppInerop/CppInterop.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// // This is the main DLL file. diff --git a/lib/local/CppInerop/FaceAnalyserInterop.h b/lib/local/CppInerop/FaceAnalyserInterop.h index 547b4c2d..19bfea75 100644 --- a/lib/local/CppInerop/FaceAnalyserInterop.h +++ b/lib/local/CppInerop/FaceAnalyserInterop.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// // FaceAnalyser_Interop.h diff --git a/lib/local/CppInerop/FaceDetectorInterop.h b/lib/local/CppInerop/FaceDetectorInterop.h index f44b5b27..960138e5 100644 --- a/lib/local/CppInerop/FaceDetectorInterop.h +++ b/lib/local/CppInerop/FaceDetectorInterop.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __LANDMARK_DETECTOR_UTILS_INTEROP_h_ diff --git a/lib/local/CppInerop/GazeAnalyserInterop.h b/lib/local/CppInerop/GazeAnalyserInterop.h index 25c84308..98354f70 100644 --- a/lib/local/CppInerop/GazeAnalyserInterop.h +++ b/lib/local/CppInerop/GazeAnalyserInterop.h @@ -14,23 +14,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// // FaceAnalyser_Interop.h diff --git a/lib/local/CppInerop/ImageReader.h b/lib/local/CppInerop/ImageReader.h index 890caf5b..85147df7 100644 --- a/lib/local/CppInerop/ImageReader.h +++ b/lib/local/CppInerop/ImageReader.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #pragma once diff --git a/lib/local/CppInerop/LandmarkDetectorInterop.h b/lib/local/CppInerop/LandmarkDetectorInterop.h index b1ba4019..e81056b5 100644 --- a/lib/local/CppInerop/LandmarkDetectorInterop.h +++ b/lib/local/CppInerop/LandmarkDetectorInterop.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __LANDMARK_DETECTOR_INTEROP_h_ diff --git a/lib/local/CppInerop/OpenCVWrappers.h b/lib/local/CppInerop/OpenCVWrappers.h index 06690369..915675ec 100644 --- a/lib/local/CppInerop/OpenCVWrappers.h +++ b/lib/local/CppInerop/OpenCVWrappers.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// // OpenCVWrappers.h diff --git a/lib/local/CppInerop/RecorderInterop.h b/lib/local/CppInerop/RecorderInterop.h index 95e9544b..4102e621 100644 --- a/lib/local/CppInerop/RecorderInterop.h +++ b/lib/local/CppInerop/RecorderInterop.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// // Camera_Interop.h diff --git a/lib/local/CppInerop/SequenceReader.h b/lib/local/CppInerop/SequenceReader.h index 77c5c1c1..7e37b11a 100644 --- a/lib/local/CppInerop/SequenceReader.h +++ b/lib/local/CppInerop/SequenceReader.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #pragma once diff --git a/lib/local/CppInerop/VisualizerInterop.h b/lib/local/CppInerop/VisualizerInterop.h index c1bf917a..7b3b9fb7 100644 --- a/lib/local/CppInerop/VisualizerInterop.h +++ b/lib/local/CppInerop/VisualizerInterop.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #pragma once diff --git a/lib/local/FaceAnalyser/include/FaceAnalyser.h b/lib/local/FaceAnalyser/include/FaceAnalyser.h index b295f36e..ccce501c 100644 --- a/lib/local/FaceAnalyser/include/FaceAnalyser.h +++ b/lib/local/FaceAnalyser/include/FaceAnalyser.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __FACEANALYSER_h_ diff --git a/lib/local/FaceAnalyser/include/FaceAnalyserParameters.h b/lib/local/FaceAnalyser/include/FaceAnalyserParameters.h index 8677fd81..bc7b4125 100644 --- a/lib/local/FaceAnalyser/include/FaceAnalyserParameters.h +++ b/lib/local/FaceAnalyser/include/FaceAnalyserParameters.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// // Parameters of the Face analyser diff --git a/lib/local/FaceAnalyser/include/Face_utils.h b/lib/local/FaceAnalyser/include/Face_utils.h index 9618302a..d9e2801d 100644 --- a/lib/local/FaceAnalyser/include/Face_utils.h +++ b/lib/local/FaceAnalyser/include/Face_utils.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __FACE_UTILS_h_ diff --git a/lib/local/FaceAnalyser/include/SVM_dynamic_lin.h b/lib/local/FaceAnalyser/include/SVM_dynamic_lin.h index 5b801347..6f72cb38 100644 --- a/lib/local/FaceAnalyser/include/SVM_dynamic_lin.h +++ b/lib/local/FaceAnalyser/include/SVM_dynamic_lin.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __SVMDYNAMICLIN_h_ diff --git a/lib/local/FaceAnalyser/include/SVM_static_lin.h b/lib/local/FaceAnalyser/include/SVM_static_lin.h index 3d58d2ab..0c0ed125 100644 --- a/lib/local/FaceAnalyser/include/SVM_static_lin.h +++ b/lib/local/FaceAnalyser/include/SVM_static_lin.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __SVMSTATICLIN_h_ diff --git a/lib/local/FaceAnalyser/include/SVR_dynamic_lin_regressors.h b/lib/local/FaceAnalyser/include/SVR_dynamic_lin_regressors.h index b90b9a3c..7dca00f9 100644 --- a/lib/local/FaceAnalyser/include/SVR_dynamic_lin_regressors.h +++ b/lib/local/FaceAnalyser/include/SVR_dynamic_lin_regressors.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __SVRDYNAMICLINREGRESSORS_h_ diff --git a/lib/local/FaceAnalyser/include/SVR_static_lin_regressors.h b/lib/local/FaceAnalyser/include/SVR_static_lin_regressors.h index 8f4fc3e7..da53b6c7 100644 --- a/lib/local/FaceAnalyser/include/SVR_static_lin_regressors.h +++ b/lib/local/FaceAnalyser/include/SVR_static_lin_regressors.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __SVRSTATICLINREGRESSORS_h_ diff --git a/lib/local/FaceAnalyser/src/FaceAnalyser.cpp b/lib/local/FaceAnalyser/src/FaceAnalyser.cpp index 0383ad65..79e19418 100644 --- a/lib/local/FaceAnalyser/src/FaceAnalyser.cpp +++ b/lib/local/FaceAnalyser/src/FaceAnalyser.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "FaceAnalyser.h" diff --git a/lib/local/FaceAnalyser/src/FaceAnalyserParameters.cpp b/lib/local/FaceAnalyser/src/FaceAnalyserParameters.cpp index 97a200aa..c5d3219b 100644 --- a/lib/local/FaceAnalyser/src/FaceAnalyserParameters.cpp +++ b/lib/local/FaceAnalyser/src/FaceAnalyserParameters.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "FaceAnalyserParameters.h" diff --git a/lib/local/FaceAnalyser/src/Face_utils.cpp b/lib/local/FaceAnalyser/src/Face_utils.cpp index bda08815..cb92fece 100644 --- a/lib/local/FaceAnalyser/src/Face_utils.cpp +++ b/lib/local/FaceAnalyser/src/Face_utils.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include diff --git a/lib/local/FaceAnalyser/src/SVM_dynamic_lin.cpp b/lib/local/FaceAnalyser/src/SVM_dynamic_lin.cpp index 9c224c09..ee404b89 100644 --- a/lib/local/FaceAnalyser/src/SVM_dynamic_lin.cpp +++ b/lib/local/FaceAnalyser/src/SVM_dynamic_lin.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "Face_utils.h" diff --git a/lib/local/FaceAnalyser/src/SVM_static_lin.cpp b/lib/local/FaceAnalyser/src/SVM_static_lin.cpp index 89b04adf..2e8b8cc8 100644 --- a/lib/local/FaceAnalyser/src/SVM_static_lin.cpp +++ b/lib/local/FaceAnalyser/src/SVM_static_lin.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "Face_utils.h" diff --git a/lib/local/FaceAnalyser/src/SVR_dynamic_lin_regressors.cpp b/lib/local/FaceAnalyser/src/SVR_dynamic_lin_regressors.cpp index 1255b3d6..09c27bbf 100644 --- a/lib/local/FaceAnalyser/src/SVR_dynamic_lin_regressors.cpp +++ b/lib/local/FaceAnalyser/src/SVR_dynamic_lin_regressors.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "Face_utils.h" diff --git a/lib/local/FaceAnalyser/src/SVR_static_lin_regressors.cpp b/lib/local/FaceAnalyser/src/SVR_static_lin_regressors.cpp index 71e26b7d..c4df7d34 100644 --- a/lib/local/FaceAnalyser/src/SVR_static_lin_regressors.cpp +++ b/lib/local/FaceAnalyser/src/SVR_static_lin_regressors.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "Face_utils.h" diff --git a/lib/local/GazeAnalyser/include/GazeEstimation.h b/lib/local/GazeAnalyser/include/GazeEstimation.h index 5b165b44..9359614e 100644 --- a/lib/local/GazeAnalyser/include/GazeEstimation.h +++ b/lib/local/GazeAnalyser/include/GazeEstimation.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __GAZEESTIMATION_h_ diff --git a/lib/local/GazeAnalyser/src/GazeEstimation.cpp b/lib/local/GazeAnalyser/src/GazeEstimation.cpp index ba05b8dc..507253dc 100644 --- a/lib/local/GazeAnalyser/src/GazeEstimation.cpp +++ b/lib/local/GazeAnalyser/src/GazeEstimation.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// diff --git a/lib/local/LandmarkDetector/include/CCNF_patch_expert.h b/lib/local/LandmarkDetector/include/CCNF_patch_expert.h index f053735c..7aeab443 100644 --- a/lib/local/LandmarkDetector/include/CCNF_patch_expert.h +++ b/lib/local/LandmarkDetector/include/CCNF_patch_expert.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __CCNF_PATCH_EXPERT_h_ diff --git a/lib/local/LandmarkDetector/include/CEN_patch_expert.h b/lib/local/LandmarkDetector/include/CEN_patch_expert.h index a9c65751..c7077395 100644 --- a/lib/local/LandmarkDetector/include/CEN_patch_expert.h +++ b/lib/local/LandmarkDetector/include/CEN_patch_expert.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// diff --git a/lib/local/LandmarkDetector/include/CNN_utils.h b/lib/local/LandmarkDetector/include/CNN_utils.h index fad0349d..af06a8ce 100644 --- a/lib/local/LandmarkDetector/include/CNN_utils.h +++ b/lib/local/LandmarkDetector/include/CNN_utils.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// // Header for all external CLNF/CLM-Z/CLM methods of interest to the user diff --git a/lib/local/LandmarkDetector/include/FaceDetectorMTCNN.h b/lib/local/LandmarkDetector/include/FaceDetectorMTCNN.h index c2a5b244..0f317733 100644 --- a/lib/local/LandmarkDetector/include/FaceDetectorMTCNN.h +++ b/lib/local/LandmarkDetector/include/FaceDetectorMTCNN.h @@ -1,59 +1,34 @@ /////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2016, Carnegie Mellon University and University of Cambridge, -// all rights reserved. +// Copyright (C) 2017, Tadas Baltrusaitis, all rights reserved. // -// THIS SOFTWARE IS PROVIDED “AS IS” FOR ACADEMIC USE ONLY AND ANY EXPRESS -// OR IMPLIED WARRANTIES WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS -// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY. -// OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. +// ACADEMIC OR NON-PROFIT ORGANIZATION NONCOMMERCIAL RESEARCH USE ONLY +// +// BY USING OR DOWNLOADING THE SOFTWARE, YOU ARE AGREEING TO THE TERMS OF THIS LICENSE AGREEMENT. +// IF YOU DO NOT AGREE WITH THESE TERMS, YOU MAY NOT USE OR DOWNLOAD THE SOFTWARE. +// +// License can be found in OpenFace-license.txt // -// Notwithstanding the license granted herein, Licensee acknowledges that certain components -// of the Software may be covered by so-called “open source” software licenses (“Open Source -// Components”), which means any software licenses approved as open source licenses by the -// Open Source Initiative or any substantially similar licenses, including without limitation any -// license that, as a condition of distribution of the software licensed under such license, -// requires that the distributor make the software available in source code format. Licensor shall -// provide a list of Open Source Components for a particular version of the Software upon -// Licensee’s request. Licensee will comply with the applicable terms of such licenses and to -// the extent required by the licenses covering Open Source Components, the terms of such -// licenses will apply in lieu of the terms of this Agreement. To the extent the terms of the -// licenses applicable to Open Source Components prohibit any of the restrictions in this -// License Agreement with respect to such Open Source Component, such restrictions will not -// apply to such Open Source Component. To the extent the terms of the licenses applicable to -// Open Source Components require Licensor to make an offer to provide source code or -// related information in connection with the Software, such offer is hereby made. Any request -// for source code or related information should be directed to cl-face-tracker-distribution@lists.cam.ac.uk -// Licensee acknowledges receipt of notices for the Open Source Components for the initial -// delivery of the Software. - // * Any publications arising from the use of this software, including but // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __FACE_DETECTOR_MTCNN_h_ diff --git a/lib/local/LandmarkDetector/include/LandmarkCoreIncludes.h b/lib/local/LandmarkDetector/include/LandmarkCoreIncludes.h index e8bd04cd..709c326c 100644 --- a/lib/local/LandmarkDetector/include/LandmarkCoreIncludes.h +++ b/lib/local/LandmarkDetector/include/LandmarkCoreIncludes.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// diff --git a/lib/local/LandmarkDetector/include/LandmarkDetectionValidator.h b/lib/local/LandmarkDetector/include/LandmarkDetectionValidator.h index b64af002..a398aeb3 100644 --- a/lib/local/LandmarkDetector/include/LandmarkDetectionValidator.h +++ b/lib/local/LandmarkDetector/include/LandmarkDetectionValidator.h @@ -1,59 +1,35 @@ /////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2016, Carnegie Mellon University and University of Cambridge, +// Copyright (C) 2017, Carnegie Mellon University and University of Cambridge, // all rights reserved. // -// THIS SOFTWARE IS PROVIDED “AS IS” FOR ACADEMIC USE ONLY AND ANY EXPRESS -// OR IMPLIED WARRANTIES WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS -// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY. -// OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. +// ACADEMIC OR NON-PROFIT ORGANIZATION NONCOMMERCIAL RESEARCH USE ONLY +// +// BY USING OR DOWNLOADING THE SOFTWARE, YOU ARE AGREEING TO THE TERMS OF THIS LICENSE AGREEMENT. +// IF YOU DO NOT AGREE WITH THESE TERMS, YOU MAY NOT USE OR DOWNLOAD THE SOFTWARE. +// +// License can be found in OpenFace-license.txt // -// Notwithstanding the license granted herein, Licensee acknowledges that certain components -// of the Software may be covered by so-called “open source” software licenses (“Open Source -// Components”), which means any software licenses approved as open source licenses by the -// Open Source Initiative or any substantially similar licenses, including without limitation any -// license that, as a condition of distribution of the software licensed under such license, -// requires that the distributor make the software available in source code format. Licensor shall -// provide a list of Open Source Components for a particular version of the Software upon -// Licensee’s request. Licensee will comply with the applicable terms of such licenses and to -// the extent required by the licenses covering Open Source Components, the terms of such -// licenses will apply in lieu of the terms of this Agreement. To the extent the terms of the -// licenses applicable to Open Source Components prohibit any of the restrictions in this -// License Agreement with respect to such Open Source Component, such restrictions will not -// apply to such Open Source Component. To the extent the terms of the licenses applicable to -// Open Source Components require Licensor to make an offer to provide source code or -// related information in connection with the Software, such offer is hereby made. Any request -// for source code or related information should be directed to cl-face-tracker-distribution@lists.cam.ac.uk -// Licensee acknowledges receipt of notices for the Open Source Components for the initial -// delivery of the Software. - // * Any publications arising from the use of this software, including but // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __LANDMARK_DETECTION_VALIDATOR_h_ diff --git a/lib/local/LandmarkDetector/include/LandmarkDetectorFunc.h b/lib/local/LandmarkDetector/include/LandmarkDetectorFunc.h index a0dd9638..deda80a5 100644 --- a/lib/local/LandmarkDetector/include/LandmarkDetectorFunc.h +++ b/lib/local/LandmarkDetector/include/LandmarkDetectorFunc.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// // Header for all external CLM/CLNF/CLM-Z methods of interest to the user diff --git a/lib/local/LandmarkDetector/include/LandmarkDetectorModel.h b/lib/local/LandmarkDetector/include/LandmarkDetectorModel.h index b0983178..6784e907 100644 --- a/lib/local/LandmarkDetector/include/LandmarkDetectorModel.h +++ b/lib/local/LandmarkDetector/include/LandmarkDetectorModel.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __LANDMARK_DETECTOR_MODEL_h_ diff --git a/lib/local/LandmarkDetector/include/LandmarkDetectorParameters.h b/lib/local/LandmarkDetector/include/LandmarkDetectorParameters.h index 9f194020..1f8e0cbf 100644 --- a/lib/local/LandmarkDetector/include/LandmarkDetectorParameters.h +++ b/lib/local/LandmarkDetector/include/LandmarkDetectorParameters.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// // Parameters of the CLNF, CLM-Z and CLM trackers diff --git a/lib/local/LandmarkDetector/include/LandmarkDetectorUtils.h b/lib/local/LandmarkDetector/include/LandmarkDetectorUtils.h index bab9ea09..54260141 100644 --- a/lib/local/LandmarkDetector/include/LandmarkDetectorUtils.h +++ b/lib/local/LandmarkDetector/include/LandmarkDetectorUtils.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// // Header for all external CLNF/CLM-Z/CLM methods of interest to the user diff --git a/lib/local/LandmarkDetector/include/PAW.h b/lib/local/LandmarkDetector/include/PAW.h index b358be50..8ed2142b 100644 --- a/lib/local/LandmarkDetector/include/PAW.h +++ b/lib/local/LandmarkDetector/include/PAW.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __PAW_h_ diff --git a/lib/local/LandmarkDetector/include/PDM.h b/lib/local/LandmarkDetector/include/PDM.h index d401b465..6040b22b 100644 --- a/lib/local/LandmarkDetector/include/PDM.h +++ b/lib/local/LandmarkDetector/include/PDM.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __PDM_h_ diff --git a/lib/local/LandmarkDetector/include/Patch_experts.h b/lib/local/LandmarkDetector/include/Patch_experts.h index 64647a0c..bdae524d 100644 --- a/lib/local/LandmarkDetector/include/Patch_experts.h +++ b/lib/local/LandmarkDetector/include/Patch_experts.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __Patch_experts_h_ diff --git a/lib/local/LandmarkDetector/include/SVR_patch_expert.h b/lib/local/LandmarkDetector/include/SVR_patch_expert.h index a762f732..5deef538 100644 --- a/lib/local/LandmarkDetector/include/SVR_patch_expert.h +++ b/lib/local/LandmarkDetector/include/SVR_patch_expert.h @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// diff --git a/lib/local/LandmarkDetector/src/CCNF_patch_expert.cpp b/lib/local/LandmarkDetector/src/CCNF_patch_expert.cpp index 37ee7d91..e064eae9 100644 --- a/lib/local/LandmarkDetector/src/CCNF_patch_expert.cpp +++ b/lib/local/LandmarkDetector/src/CCNF_patch_expert.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" diff --git a/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp b/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp index c4b18571..cc65a9dd 100644 --- a/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp +++ b/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp @@ -1,59 +1,35 @@ /////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2016, Carnegie Mellon University and University of Cambridge, +// Copyright (C) 2017, Carnegie Mellon University and University of Cambridge, // all rights reserved. // -// THIS SOFTWARE IS PROVIDED “AS IS” FOR ACADEMIC USE ONLY AND ANY EXPRESS -// OR IMPLIED WARRANTIES WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS -// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY. -// OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. +// ACADEMIC OR NON-PROFIT ORGANIZATION NONCOMMERCIAL RESEARCH USE ONLY +// +// BY USING OR DOWNLOADING THE SOFTWARE, YOU ARE AGREEING TO THE TERMS OF THIS LICENSE AGREEMENT. +// IF YOU DO NOT AGREE WITH THESE TERMS, YOU MAY NOT USE OR DOWNLOAD THE SOFTWARE. +// +// License can be found in OpenFace-license.txt // -// Notwithstanding the license granted herein, Licensee acknowledges that certain components -// of the Software may be covered by so-called “open source” software licenses (“Open Source -// Components”), which means any software licenses approved as open source licenses by the -// Open Source Initiative or any substantially similar licenses, including without limitation any -// license that, as a condition of distribution of the software licensed under such license, -// requires that the distributor make the software available in source code format. Licensor shall -// provide a list of Open Source Components for a particular version of the Software upon -// Licensee’s request. Licensee will comply with the applicable terms of such licenses and to -// the extent required by the licenses covering Open Source Components, the terms of such -// licenses will apply in lieu of the terms of this Agreement. To the extent the terms of the -// licenses applicable to Open Source Components prohibit any of the restrictions in this -// License Agreement with respect to such Open Source Component, such restrictions will not -// apply to such Open Source Component. To the extent the terms of the licenses applicable to -// Open Source Components require Licensor to make an offer to provide source code or -// related information in connection with the Software, such offer is hereby made. Any request -// for source code or related information should be directed to cl-face-tracker-distribution@lists.cam.ac.uk -// Licensee acknowledges receipt of notices for the Open Source Components for the initial -// delivery of the Software. - // * Any publications arising from the use of this software, including but // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" diff --git a/lib/local/LandmarkDetector/src/CNN_utils.cpp b/lib/local/LandmarkDetector/src/CNN_utils.cpp index c998e058..2307e17a 100644 --- a/lib/local/LandmarkDetector/src/CNN_utils.cpp +++ b/lib/local/LandmarkDetector/src/CNN_utils.cpp @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" diff --git a/lib/local/LandmarkDetector/src/FaceDetectorMTCNN.cpp b/lib/local/LandmarkDetector/src/FaceDetectorMTCNN.cpp index 46681bf4..4226df69 100644 --- a/lib/local/LandmarkDetector/src/FaceDetectorMTCNN.cpp +++ b/lib/local/LandmarkDetector/src/FaceDetectorMTCNN.cpp @@ -1,59 +1,35 @@ /////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2016, Carnegie Mellon University and University of Cambridge, +// Copyright (C) 2017, Carnegie Mellon University and University of Cambridge, // all rights reserved. // -// THIS SOFTWARE IS PROVIDED “AS IS” FOR ACADEMIC USE ONLY AND ANY EXPRESS -// OR IMPLIED WARRANTIES WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS -// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY. -// OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. +// ACADEMIC OR NON-PROFIT ORGANIZATION NONCOMMERCIAL RESEARCH USE ONLY +// +// BY USING OR DOWNLOADING THE SOFTWARE, YOU ARE AGREEING TO THE TERMS OF THIS LICENSE AGREEMENT. +// IF YOU DO NOT AGREE WITH THESE TERMS, YOU MAY NOT USE OR DOWNLOAD THE SOFTWARE. +// +// License can be found in OpenFace-license.txt // -// Notwithstanding the license granted herein, Licensee acknowledges that certain components -// of the Software may be covered by so-called “open source” software licenses (“Open Source -// Components”), which means any software licenses approved as open source licenses by the -// Open Source Initiative or any substantially similar licenses, including without limitation any -// license that, as a condition of distribution of the software licensed under such license, -// requires that the distributor make the software available in source code format. Licensor shall -// provide a list of Open Source Components for a particular version of the Software upon -// Licensee’s request. Licensee will comply with the applicable terms of such licenses and to -// the extent required by the licenses covering Open Source Components, the terms of such -// licenses will apply in lieu of the terms of this Agreement. To the extent the terms of the -// licenses applicable to Open Source Components prohibit any of the restrictions in this -// License Agreement with respect to such Open Source Component, such restrictions will not -// apply to such Open Source Component. To the extent the terms of the licenses applicable to -// Open Source Components require Licensor to make an offer to provide source code or -// related information in connection with the Software, such offer is hereby made. Any request -// for source code or related information should be directed to cl-face-tracker-distribution@lists.cam.ac.uk -// Licensee acknowledges receipt of notices for the Open Source Components for the initial -// delivery of the Software. - // * Any publications arising from the use of this software, including but // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" diff --git a/lib/local/LandmarkDetector/src/LandmarkDetectionValidator.cpp b/lib/local/LandmarkDetector/src/LandmarkDetectionValidator.cpp index a19caf56..6a0ef56a 100644 --- a/lib/local/LandmarkDetector/src/LandmarkDetectionValidator.cpp +++ b/lib/local/LandmarkDetector/src/LandmarkDetectionValidator.cpp @@ -1,59 +1,35 @@ /////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2016, Carnegie Mellon University and University of Cambridge, +// Copyright (C) 2017, Carnegie Mellon University and University of Cambridge, // all rights reserved. // -// THIS SOFTWARE IS PROVIDED “AS IS” FOR ACADEMIC USE ONLY AND ANY EXPRESS -// OR IMPLIED WARRANTIES WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS -// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY. -// OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. +// ACADEMIC OR NON-PROFIT ORGANIZATION NONCOMMERCIAL RESEARCH USE ONLY +// +// BY USING OR DOWNLOADING THE SOFTWARE, YOU ARE AGREEING TO THE TERMS OF THIS LICENSE AGREEMENT. +// IF YOU DO NOT AGREE WITH THESE TERMS, YOU MAY NOT USE OR DOWNLOAD THE SOFTWARE. +// +// License can be found in OpenFace-license.txt // -// Notwithstanding the license granted herein, Licensee acknowledges that certain components -// of the Software may be covered by so-called “open source” software licenses (“Open Source -// Components”), which means any software licenses approved as open source licenses by the -// Open Source Initiative or any substantially similar licenses, including without limitation any -// license that, as a condition of distribution of the software licensed under such license, -// requires that the distributor make the software available in source code format. Licensor shall -// provide a list of Open Source Components for a particular version of the Software upon -// Licensee’s request. Licensee will comply with the applicable terms of such licenses and to -// the extent required by the licenses covering Open Source Components, the terms of such -// licenses will apply in lieu of the terms of this Agreement. To the extent the terms of the -// licenses applicable to Open Source Components prohibit any of the restrictions in this -// License Agreement with respect to such Open Source Component, such restrictions will not -// apply to such Open Source Component. To the extent the terms of the licenses applicable to -// Open Source Components require Licensor to make an offer to provide source code or -// related information in connection with the Software, such offer is hereby made. Any request -// for source code or related information should be directed to cl-face-tracker-distribution@lists.cam.ac.uk -// Licensee acknowledges receipt of notices for the Open Source Components for the initial -// delivery of the Software. - // * Any publications arising from the use of this software, including but // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" diff --git a/lib/local/LandmarkDetector/src/LandmarkDetectorFunc.cpp b/lib/local/LandmarkDetector/src/LandmarkDetectorFunc.cpp index f47e66f2..f0a9e776 100644 --- a/lib/local/LandmarkDetector/src/LandmarkDetectorFunc.cpp +++ b/lib/local/LandmarkDetector/src/LandmarkDetectorFunc.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" diff --git a/lib/local/LandmarkDetector/src/LandmarkDetectorModel.cpp b/lib/local/LandmarkDetector/src/LandmarkDetectorModel.cpp index 9a595df3..b7039e31 100644 --- a/lib/local/LandmarkDetector/src/LandmarkDetectorModel.cpp +++ b/lib/local/LandmarkDetector/src/LandmarkDetectorModel.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" diff --git a/lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp b/lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp index 6f630500..95233d56 100644 --- a/lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp +++ b/lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" diff --git a/lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp b/lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp index f2e349fb..87146778 100644 --- a/lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp +++ b/lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" diff --git a/lib/local/LandmarkDetector/src/PAW.cpp b/lib/local/LandmarkDetector/src/PAW.cpp index 8ff3b5ac..13eb723d 100644 --- a/lib/local/LandmarkDetector/src/PAW.cpp +++ b/lib/local/LandmarkDetector/src/PAW.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" diff --git a/lib/local/LandmarkDetector/src/PDM.cpp b/lib/local/LandmarkDetector/src/PDM.cpp index 12cc9333..ce4e953f 100644 --- a/lib/local/LandmarkDetector/src/PDM.cpp +++ b/lib/local/LandmarkDetector/src/PDM.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" diff --git a/lib/local/LandmarkDetector/src/Patch_experts.cpp b/lib/local/LandmarkDetector/src/Patch_experts.cpp index 21a9508f..b314672c 100644 --- a/lib/local/LandmarkDetector/src/Patch_experts.cpp +++ b/lib/local/LandmarkDetector/src/Patch_experts.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" diff --git a/lib/local/LandmarkDetector/src/SVR_patch_expert.cpp b/lib/local/LandmarkDetector/src/SVR_patch_expert.cpp index 6a01f102..ace3317d 100644 --- a/lib/local/LandmarkDetector/src/SVR_patch_expert.cpp +++ b/lib/local/LandmarkDetector/src/SVR_patch_expert.cpp @@ -13,23 +13,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" diff --git a/lib/local/Utilities/include/ImageCapture.h b/lib/local/Utilities/include/ImageCapture.h index 480c1ed7..58a0d688 100644 --- a/lib/local/Utilities/include/ImageCapture.h +++ b/lib/local/Utilities/include/ImageCapture.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __IMAGE_CAPTURE_h_ diff --git a/lib/local/Utilities/include/ImageManipulationHelpers.h b/lib/local/Utilities/include/ImageManipulationHelpers.h index 23a4cb0f..217c3e4d 100644 --- a/lib/local/Utilities/include/ImageManipulationHelpers.h +++ b/lib/local/Utilities/include/ImageManipulationHelpers.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __IMAGE_MANIPULATION_HELPERS_h_ diff --git a/lib/local/Utilities/include/RecorderCSV.h b/lib/local/Utilities/include/RecorderCSV.h index a388a69f..f640c2c6 100644 --- a/lib/local/Utilities/include/RecorderCSV.h +++ b/lib/local/Utilities/include/RecorderCSV.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __RECORDER_CSV_h_ diff --git a/lib/local/Utilities/include/RecorderHOG.h b/lib/local/Utilities/include/RecorderHOG.h index e091bffe..2d606084 100644 --- a/lib/local/Utilities/include/RecorderHOG.h +++ b/lib/local/Utilities/include/RecorderHOG.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __RECORDER_HOG_h_ diff --git a/lib/local/Utilities/include/RecorderOpenFace.h b/lib/local/Utilities/include/RecorderOpenFace.h index 1b7ae6e6..fdcd6a74 100644 --- a/lib/local/Utilities/include/RecorderOpenFace.h +++ b/lib/local/Utilities/include/RecorderOpenFace.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __RECORDER_OPENFACE_h_ diff --git a/lib/local/Utilities/include/RecorderOpenFaceParameters.h b/lib/local/Utilities/include/RecorderOpenFaceParameters.h index a2027b58..a6e5d7d1 100644 --- a/lib/local/Utilities/include/RecorderOpenFaceParameters.h +++ b/lib/local/Utilities/include/RecorderOpenFaceParameters.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// // Parameters of the Face analyser diff --git a/lib/local/Utilities/include/RotationHelpers.h b/lib/local/Utilities/include/RotationHelpers.h index 2c85827f..488893a5 100644 --- a/lib/local/Utilities/include/RotationHelpers.h +++ b/lib/local/Utilities/include/RotationHelpers.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __ROTATION_HELPERS_h_ diff --git a/lib/local/Utilities/include/SequenceCapture.h b/lib/local/Utilities/include/SequenceCapture.h index fa9ba716..2c89f173 100644 --- a/lib/local/Utilities/include/SequenceCapture.h +++ b/lib/local/Utilities/include/SequenceCapture.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __SEQUENCE_CAPTURE_h_ diff --git a/lib/local/Utilities/include/VisualizationUtils.h b/lib/local/Utilities/include/VisualizationUtils.h index 5df09383..079428b2 100644 --- a/lib/local/Utilities/include/VisualizationUtils.h +++ b/lib/local/Utilities/include/VisualizationUtils.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __VISUALIZATION_UTILS_h_ diff --git a/lib/local/Utilities/include/Visualizer.h b/lib/local/Utilities/include/Visualizer.h index e7bf13f3..3016060c 100644 --- a/lib/local/Utilities/include/Visualizer.h +++ b/lib/local/Utilities/include/Visualizer.h @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #ifndef __VISUALIZER_h_ diff --git a/lib/local/Utilities/src/ImageCapture.cpp b/lib/local/Utilities/src/ImageCapture.cpp index d7b656ad..a2465bc2 100644 --- a/lib/local/Utilities/src/ImageCapture.cpp +++ b/lib/local/Utilities/src/ImageCapture.cpp @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "ImageCapture.h" diff --git a/lib/local/Utilities/src/RecorderCSV.cpp b/lib/local/Utilities/src/RecorderCSV.cpp index 2f190e11..5905a83b 100644 --- a/lib/local/Utilities/src/RecorderCSV.cpp +++ b/lib/local/Utilities/src/RecorderCSV.cpp @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "RecorderCSV.h" diff --git a/lib/local/Utilities/src/RecorderHOG.cpp b/lib/local/Utilities/src/RecorderHOG.cpp index ae6332d8..08074db7 100644 --- a/lib/local/Utilities/src/RecorderHOG.cpp +++ b/lib/local/Utilities/src/RecorderHOG.cpp @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "RecorderHOG.h" diff --git a/lib/local/Utilities/src/RecorderOpenFace.cpp b/lib/local/Utilities/src/RecorderOpenFace.cpp index 4aa9f7ca..fd23f9e7 100644 --- a/lib/local/Utilities/src/RecorderOpenFace.cpp +++ b/lib/local/Utilities/src/RecorderOpenFace.cpp @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "RecorderOpenFace.h" diff --git a/lib/local/Utilities/src/RecorderOpenFaceParameters.cpp b/lib/local/Utilities/src/RecorderOpenFaceParameters.cpp index 03fbc6f0..11786764 100644 --- a/lib/local/Utilities/src/RecorderOpenFaceParameters.cpp +++ b/lib/local/Utilities/src/RecorderOpenFaceParameters.cpp @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "RecorderOpenFaceParameters.h" diff --git a/lib/local/Utilities/src/SequenceCapture.cpp b/lib/local/Utilities/src/SequenceCapture.cpp index 20839bb8..5a8bc206 100644 --- a/lib/local/Utilities/src/SequenceCapture.cpp +++ b/lib/local/Utilities/src/SequenceCapture.cpp @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "SequenceCapture.h" diff --git a/lib/local/Utilities/src/VisualizationUtils.cpp b/lib/local/Utilities/src/VisualizationUtils.cpp index 697f5043..27c4b727 100644 --- a/lib/local/Utilities/src/VisualizationUtils.cpp +++ b/lib/local/Utilities/src/VisualizationUtils.cpp @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "VisualizationUtils.h" diff --git a/lib/local/Utilities/src/Visualizer.cpp b/lib/local/Utilities/src/Visualizer.cpp index 111224af..bc41b83f 100644 --- a/lib/local/Utilities/src/Visualizer.cpp +++ b/lib/local/Utilities/src/Visualizer.cpp @@ -12,23 +12,23 @@ // not limited to academic journal and conference publications, technical // reports and manuals, must cite at least one of the following works: // -// OpenFace: an open source facial behavior analysis toolkit -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency -// in IEEE Winter Conference on Applications of Computer Vision, 2016 +// OpenFace 2.0: Facial Behavior Analysis Toolkit +// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency +// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018 +// +// Convolutional experts constrained local model for facial landmark detection. +// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency, +// in Computer Vision and Pattern Recognition Workshops, 2017. // // Rendering of Eyes for Eye-Shape Registration and Gaze Estimation // Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling // in IEEE International. Conference on Computer Vision (ICCV), 2015 // -// Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection +// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection // Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson // in Facial Expression Recognition and Analysis Challenge, // IEEE International Conference on Automatic Face and Gesture Recognition, 2015 // -// Constrained Local Neural Fields for robust facial landmark detection in the wild. -// Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. -// in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013. -// /////////////////////////////////////////////////////////////////////////////// #include "Visualizer.h" From c36c29027607b87c2558f2f04f770f56f53dd503 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Tue, 29 May 2018 19:38:32 +0100 Subject: [PATCH 03/16] Small travis fix. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e221aa4..8d2c48fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,8 +82,8 @@ script: - export OMP_NUM_THREADS=1 - export VECLIB_MAXIMUM_THREADS=1 - ../build/bin/FaceLandmarkImg -fdir ../samples -out_dir data -multi_view 1 -wild -q - - ../build/bin/FaceLandmarkImg -fdir ../samples/sample1.jpg -out_dir data -multi_view 1 -wild -q + - ../build/bin/FaceLandmarkImg -f ../samples/sample1.jpg -out_dir data -multi_view 1 -wild -q - ../build/bin/FeatureExtraction -fdir "../samples/image_sequence" -out_dir output -q - - ../build/bin/FeatureExtraction -f "../samples/2015-10-15-15-14.avi" -q + - ../build/bin/FeatureExtraction -f "../samples/2015-10-15-15-14.avi" -q -mloc model/main_clm_general.txt - ../build/bin/FaceLandmarkVidMulti -fdir ../samples/image_sequence -q -mloc model/main_clm_general.txt - ../build/bin/FaceLandmarkVidMulti -f ../samples/multi_face.avi -q -mloc model/main_clnf_general.txt \ No newline at end of file From 1cb6215687f7486260e8b969b2bcb146f4e5e617 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Tue, 29 May 2018 21:34:09 +0100 Subject: [PATCH 04/16] Debugging travis, temporary change --- exe/FeatureExtraction/FeatureExtraction.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/exe/FeatureExtraction/FeatureExtraction.cpp b/exe/FeatureExtraction/FeatureExtraction.cpp index ea8ed476..0a106f6c 100644 --- a/exe/FeatureExtraction/FeatureExtraction.cpp +++ b/exe/FeatureExtraction/FeatureExtraction.cpp @@ -175,6 +175,9 @@ int main(int argc, char **argv) // The actual facial landmark detection / tracking bool detection_success = LandmarkDetector::DetectLandmarksInVideo(captured_image, face_model, det_parameters, grayscale_image); + // TODO rem + cout << "Landmarks detected" << endl; + // Gaze tracking, absolute gaze direction cv::Point3f gazeDirection0(0, 0, 0); cv::Point3f gazeDirection1(0, 0, 0); cv::Vec2d gazeAngle(0, 0); From bc779747457ef0d464246261c931f62797a197f4 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Tue, 29 May 2018 21:52:59 +0100 Subject: [PATCH 05/16] Another attempt to figure out why travis breaks. --- .travis.yml | 2 +- lib/local/Utilities/src/SequenceCapture.cpp | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8d2c48fa..802a18b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,9 +81,9 @@ script: - make -j4 - export OMP_NUM_THREADS=1 - export VECLIB_MAXIMUM_THREADS=1 + - ../build/bin/FeatureExtraction -f "../samples/2015-10-15-15-14.avi" -q -mloc model/main_clm_general.txt - ../build/bin/FaceLandmarkImg -fdir ../samples -out_dir data -multi_view 1 -wild -q - ../build/bin/FaceLandmarkImg -f ../samples/sample1.jpg -out_dir data -multi_view 1 -wild -q - ../build/bin/FeatureExtraction -fdir "../samples/image_sequence" -out_dir output -q - - ../build/bin/FeatureExtraction -f "../samples/2015-10-15-15-14.avi" -q -mloc model/main_clm_general.txt - ../build/bin/FaceLandmarkVidMulti -fdir ../samples/image_sequence -q -mloc model/main_clm_general.txt - ../build/bin/FaceLandmarkVidMulti -f ../samples/multi_face.avi -q -mloc model/main_clnf_general.txt \ No newline at end of file diff --git a/lib/local/Utilities/src/SequenceCapture.cpp b/lib/local/Utilities/src/SequenceCapture.cpp index 5a8bc206..7ad37c18 100644 --- a/lib/local/Utilities/src/SequenceCapture.cpp +++ b/lib/local/Utilities/src/SequenceCapture.cpp @@ -487,6 +487,9 @@ void SequenceCapture::CaptureThread() // Set the grayscale frame ConvertToGrayscale_8bit(tmp_frame, tmp_gray_frame); + // TODO rem + std::cout << "Capture queue size inserting " << capture_queue.size() << std::endl; + capture_queue.push(std::make_tuple(timestamp_curr, tmp_frame, tmp_gray_frame)); } } @@ -496,6 +499,10 @@ cv::Mat SequenceCapture::GetNextFrame() if(!is_webcam) { std::tuple > data; + + // TODO rem + std::cout << "Capture queue size getting " << capture_queue.size() << std::endl; + capture_queue.pop(data); time_stamp = std::get<0>(data); latest_frame = std::get<1>(data); From f3bdf085d551a7c22cff0f70b172b9b4fbfc1d3d Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Tue, 29 May 2018 22:05:47 +0100 Subject: [PATCH 06/16] More travis debugging. --- exe/FeatureExtraction/FeatureExtraction.cpp | 15 +++++++++++++-- lib/local/Utilities/src/SequenceCapture.cpp | 6 ------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/exe/FeatureExtraction/FeatureExtraction.cpp b/exe/FeatureExtraction/FeatureExtraction.cpp index 0a106f6c..94978194 100644 --- a/exe/FeatureExtraction/FeatureExtraction.cpp +++ b/exe/FeatureExtraction/FeatureExtraction.cpp @@ -168,16 +168,21 @@ int main(int argc, char **argv) INFO_STREAM("Starting tracking"); while (!captured_image.empty()) { + // TODO rem + cout << "Grabbing frame" << endl; // Converting to grayscale cv::Mat_ grayscale_image = sequence_reader.GetGrayFrame(); + // TODO rem + cout << "Frame grabbed" << endl; + // The actual facial landmark detection / tracking bool detection_success = LandmarkDetector::DetectLandmarksInVideo(captured_image, face_model, det_parameters, grayscale_image); - + // TODO rem cout << "Landmarks detected" << endl; - + // Gaze tracking, absolute gaze direction cv::Point3f gazeDirection0(0, 0, 0); cv::Point3f gazeDirection1(0, 0, 0); cv::Vec2d gazeAngle(0, 0); @@ -188,6 +193,9 @@ int main(int argc, char **argv) gazeAngle = GazeAnalysis::GetGazeAngle(gazeDirection0, gazeDirection1); } + // TODO rem + cout << "Gaze detected" << endl; + // Do face alignment cv::Mat sim_warped_img; cv::Mat_ hog_descriptor; int num_hog_rows = 0, num_hog_cols = 0; @@ -200,6 +208,9 @@ int main(int argc, char **argv) face_analyser.GetLatestHOG(hog_descriptor, num_hog_rows, num_hog_cols); } + // TODO rem + cout << "AUs detected" << endl; + // Work out the pose of the head from the tracked model cv::Vec6d pose_estimate = LandmarkDetector::GetPose(face_model, sequence_reader.fx, sequence_reader.fy, sequence_reader.cx, sequence_reader.cy); diff --git a/lib/local/Utilities/src/SequenceCapture.cpp b/lib/local/Utilities/src/SequenceCapture.cpp index 7ad37c18..ba397f51 100644 --- a/lib/local/Utilities/src/SequenceCapture.cpp +++ b/lib/local/Utilities/src/SequenceCapture.cpp @@ -487,9 +487,6 @@ void SequenceCapture::CaptureThread() // Set the grayscale frame ConvertToGrayscale_8bit(tmp_frame, tmp_gray_frame); - // TODO rem - std::cout << "Capture queue size inserting " << capture_queue.size() << std::endl; - capture_queue.push(std::make_tuple(timestamp_curr, tmp_frame, tmp_gray_frame)); } } @@ -500,9 +497,6 @@ cv::Mat SequenceCapture::GetNextFrame() { std::tuple > data; - // TODO rem - std::cout << "Capture queue size getting " << capture_queue.size() << std::endl; - capture_queue.pop(data); time_stamp = std::get<0>(data); latest_frame = std::get<1>(data); From 5683a79ad26718b3dd4c54cb4b790e7d7f5656f6 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Tue, 29 May 2018 22:33:17 +0100 Subject: [PATCH 07/16] Another attempt at the travis fix. --- lib/local/Utilities/src/RecorderOpenFace.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/local/Utilities/src/RecorderOpenFace.cpp b/lib/local/Utilities/src/RecorderOpenFace.cpp index fd23f9e7..7458637e 100644 --- a/lib/local/Utilities/src/RecorderOpenFace.cpp +++ b/lib/local/Utilities/src/RecorderOpenFace.cpp @@ -413,7 +413,10 @@ void RecorderOpenFace::WriteObservation() if(params.outputBadAligned() || landmark_detection_success) { - aligned_face_queue.push(std::pair(out_file, aligned_face)); + while (!aligned_face_queue.try_push(std::pair(out_file, aligned_face))) + { + std::this_thread::sleep_for(std::chrono::milliseconds(10)); + } } // Clear the image @@ -442,11 +445,18 @@ void RecorderOpenFace::WriteObservationTracked() if (params.isSequence()) { - vis_to_out_queue.push(std::pair("", vis_to_out)); + while (!vis_to_out_queue.try_push(std::pair("", vis_to_out))) + { + std::this_thread::sleep_for(std::chrono::milliseconds(20)); + } + } else { - vis_to_out_queue.push(std::pair(media_filename, vis_to_out)); + while (!vis_to_out_queue.try_push(std::pair(media_filename, vis_to_out))) + { + std::this_thread::sleep_for(std::chrono::milliseconds(20)); + } } // Clear the output vis_to_out = cv::Mat(); From d332611905557b1cf5629f4a0d7b36125cbe670a Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Tue, 29 May 2018 22:46:48 +0100 Subject: [PATCH 08/16] More investigations. --- exe/FeatureExtraction/FeatureExtraction.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/exe/FeatureExtraction/FeatureExtraction.cpp b/exe/FeatureExtraction/FeatureExtraction.cpp index 94978194..780814a2 100644 --- a/exe/FeatureExtraction/FeatureExtraction.cpp +++ b/exe/FeatureExtraction/FeatureExtraction.cpp @@ -230,6 +230,8 @@ int main(int argc, char **argv) // detect key presses char character_press = visualizer.ShowObservation(); + cout << "Visualizer done" << endl; + // quit processing the current sequence (useful when in Webcam mode) if (character_press == 'q') { @@ -251,6 +253,8 @@ int main(int argc, char **argv) open_face_rec.WriteObservation(); open_face_rec.WriteObservationTracked(); + cout << "Recording set done" << endl; + // Reporting progress if (sequence_reader.GetProgress() >= reported_completion / 10.0) { From 6f1489c812a2c7770b7acec50d917a1856de4575 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Wed, 30 May 2018 07:53:05 +0100 Subject: [PATCH 09/16] Some more travis debugging. --- exe/FeatureExtraction/FeatureExtraction.cpp | 10 ++-------- lib/local/Utilities/src/RecorderOpenFace.cpp | 5 +++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/exe/FeatureExtraction/FeatureExtraction.cpp b/exe/FeatureExtraction/FeatureExtraction.cpp index 780814a2..a4b41f88 100644 --- a/exe/FeatureExtraction/FeatureExtraction.cpp +++ b/exe/FeatureExtraction/FeatureExtraction.cpp @@ -168,9 +168,6 @@ int main(int argc, char **argv) INFO_STREAM("Starting tracking"); while (!captured_image.empty()) { - // TODO rem - cout << "Grabbing frame" << endl; - // Converting to grayscale cv::Mat_ grayscale_image = sequence_reader.GetGrayFrame(); @@ -180,7 +177,7 @@ int main(int argc, char **argv) // The actual facial landmark detection / tracking bool detection_success = LandmarkDetector::DetectLandmarksInVideo(captured_image, face_model, det_parameters, grayscale_image); - // TODO rem + // TODO rem cout << "Landmarks detected" << endl; // Gaze tracking, absolute gaze direction @@ -192,10 +189,7 @@ int main(int argc, char **argv) GazeAnalysis::EstimateGaze(face_model, gazeDirection1, sequence_reader.fx, sequence_reader.fy, sequence_reader.cx, sequence_reader.cy, false); gazeAngle = GazeAnalysis::GetGazeAngle(gazeDirection0, gazeDirection1); } - - // TODO rem - cout << "Gaze detected" << endl; - + // Do face alignment cv::Mat sim_warped_img; cv::Mat_ hog_descriptor; int num_hog_rows = 0, num_hog_cols = 0; diff --git a/lib/local/Utilities/src/RecorderOpenFace.cpp b/lib/local/Utilities/src/RecorderOpenFace.cpp index 7458637e..a99dac29 100644 --- a/lib/local/Utilities/src/RecorderOpenFace.cpp +++ b/lib/local/Utilities/src/RecorderOpenFace.cpp @@ -301,6 +301,8 @@ void RecorderOpenFace::AlignedImageWritingTask() WARN_STREAM("Could not output similarity aligned image image"); } } + std::cout << "sleeping while waiting to write, aligned face queue size" << aligned_face_queue.size() << std::endl; + std::this_thread::sleep_for(std::chrono::milliseconds(100)); } @@ -332,6 +334,9 @@ void RecorderOpenFace::VideoWritingTask() } } } + + std::cout << "sleeping while waiting to write, video queue size" << vis_to_out_queue.size() << std::endl; + std::this_thread::sleep_for(std::chrono::milliseconds(100)); } From 2a371a46d8841ed772cbe3f0c5152091fd6664d3 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Wed, 30 May 2018 08:05:41 +0100 Subject: [PATCH 10/16] Some more debugging. --- exe/FeatureExtraction/FeatureExtraction.cpp | 18 +++--------------- lib/local/Utilities/src/RecorderOpenFace.cpp | 2 ++ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/exe/FeatureExtraction/FeatureExtraction.cpp b/exe/FeatureExtraction/FeatureExtraction.cpp index a4b41f88..11af6d52 100644 --- a/exe/FeatureExtraction/FeatureExtraction.cpp +++ b/exe/FeatureExtraction/FeatureExtraction.cpp @@ -171,15 +171,10 @@ int main(int argc, char **argv) // Converting to grayscale cv::Mat_ grayscale_image = sequence_reader.GetGrayFrame(); - // TODO rem - cout << "Frame grabbed" << endl; // The actual facial landmark detection / tracking bool detection_success = LandmarkDetector::DetectLandmarksInVideo(captured_image, face_model, det_parameters, grayscale_image); - // TODO rem - cout << "Landmarks detected" << endl; - // Gaze tracking, absolute gaze direction cv::Point3f gazeDirection0(0, 0, 0); cv::Point3f gazeDirection1(0, 0, 0); cv::Vec2d gazeAngle(0, 0); @@ -201,10 +196,7 @@ int main(int argc, char **argv) face_analyser.GetLatestAlignedFace(sim_warped_img); face_analyser.GetLatestHOG(hog_descriptor, num_hog_rows, num_hog_cols); } - - // TODO rem - cout << "AUs detected" << endl; - + // Work out the pose of the head from the tracked model cv::Vec6d pose_estimate = LandmarkDetector::GetPose(face_model, sequence_reader.fx, sequence_reader.fy, sequence_reader.cx, sequence_reader.cy); @@ -223,9 +215,7 @@ int main(int argc, char **argv) // detect key presses char character_press = visualizer.ShowObservation(); - - cout << "Visualizer done" << endl; - + // quit processing the current sequence (useful when in Webcam mode) if (character_press == 'q') { @@ -246,9 +236,7 @@ int main(int argc, char **argv) open_face_rec.SetObservationFaceAlign(sim_warped_img); open_face_rec.WriteObservation(); open_face_rec.WriteObservationTracked(); - - cout << "Recording set done" << endl; - + // Reporting progress if (sequence_reader.GetProgress() >= reported_completion / 10.0) { diff --git a/lib/local/Utilities/src/RecorderOpenFace.cpp b/lib/local/Utilities/src/RecorderOpenFace.cpp index a99dac29..90f258d5 100644 --- a/lib/local/Utilities/src/RecorderOpenFace.cpp +++ b/lib/local/Utilities/src/RecorderOpenFace.cpp @@ -287,6 +287,7 @@ void RecorderOpenFace::SetObservationVisualization(const cv::Mat &vis_track) void RecorderOpenFace::AlignedImageWritingTask() { + std::cout << "Aligned writing thread has started" << std::endl; while (recording || !aligned_face_queue.empty()) { @@ -310,6 +311,7 @@ void RecorderOpenFace::AlignedImageWritingTask() void RecorderOpenFace::VideoWritingTask() { + std::cout << "Video writing thread has started" << std::endl; while(recording || !vis_to_out_queue.empty()) { From 0d758babf8d20632fc30ff56b0cdaeba8f5cf4ea Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Wed, 30 May 2018 20:13:47 +0100 Subject: [PATCH 11/16] A different way of threading output. --- .../Utilities/include/RecorderOpenFace.h | 18 +- lib/local/Utilities/src/RecorderOpenFace.cpp | 225 +++++++++--------- lib/local/Utilities/src/SequenceCapture.cpp | 1 - 3 files changed, 119 insertions(+), 125 deletions(-) diff --git a/lib/local/Utilities/include/RecorderOpenFace.h b/lib/local/Utilities/include/RecorderOpenFace.h index fdcd6a74..bbfb6c29 100644 --- a/lib/local/Utilities/include/RecorderOpenFace.h +++ b/lib/local/Utilities/include/RecorderOpenFace.h @@ -49,6 +49,9 @@ #include #include +// Threading includes +#include + namespace Utilities { @@ -113,16 +116,6 @@ namespace Utilities private: - // Used to keep track if the recording is still going (for the writing threads) - bool recording; - - // For keeping track of tasks - tbb::task_group writing_threads; - - // A thread that will write video output, so that the rest of the application does not block on it - void VideoWritingTask(); - void AlignedImageWritingTask(); - // Blocking copy, assignment and move operators, as it does not make sense to save to the same location RecorderOpenFace & operator= (const RecorderOpenFace& other); RecorderOpenFace & operator= (const RecorderOpenFace&& other); @@ -188,6 +181,11 @@ namespace Utilities cv::Mat aligned_face; tbb::concurrent_bounded_queue > aligned_face_queue; + std::thread video_writing_thread; + std::thread aligned_writing_thread; + + bool closed = false; + }; } #endif \ No newline at end of file diff --git a/lib/local/Utilities/src/RecorderOpenFace.cpp b/lib/local/Utilities/src/RecorderOpenFace.cpp index 90f258d5..11d77bd1 100644 --- a/lib/local/Utilities/src/RecorderOpenFace.cpp +++ b/lib/local/Utilities/src/RecorderOpenFace.cpp @@ -80,9 +80,62 @@ void CreateDirectory(std::string output_path) } } +void VideoWritingTask(tbb::concurrent_bounded_queue > *writing_queue, bool is_sequence, cv::VideoWriter *video_writer) +{ + + std::pair tracked_data; + + while (true) + { + writing_queue->pop(tracked_data); + + // Indicate that the thread should complete + if (tracked_data.second.empty()) + { + break; + } + + if (is_sequence) + { + if (video_writer->isOpened()) + { + video_writer->write(tracked_data.second); + } + } + else + { + bool out_success = cv::imwrite(tracked_data.first, tracked_data.second); + if (!out_success) + { + WARN_STREAM("Could not output tracked image"); + } + } + } +} + +void AlignedImageWritingTask(tbb::concurrent_bounded_queue > *writing_queue) +{ + std::pair tracked_data; + + while (true) + { + writing_queue->pop(tracked_data); + + // Empty frame indicates termination + if (tracked_data.second.empty()) + break; + + bool write_success = cv::imwrite(tracked_data.first, tracked_data.second); + + if (!write_success) + { + WARN_STREAM("Could not output similarity aligned image image"); + } + } +} + void RecorderOpenFace::PrepareRecording(const std::string& in_filename) { - recording = true; // Construct the directories required for the output CreateDirectory(record_root); @@ -148,9 +201,6 @@ void RecorderOpenFace::PrepareRecording(const std::string& in_filename) metadata_file << "Output image:" << this->media_filename << endl; this->media_filename = (path(record_root) / this->media_filename).string(); } - - // Start the video and image writing thread - writing_threads.run([&] {VideoWritingTask(); }); } // Prepare image recording @@ -159,14 +209,11 @@ void RecorderOpenFace::PrepareRecording(const std::string& in_filename) aligned_output_directory = out_name + "_aligned"; metadata_file << "Output aligned directory:" << this->aligned_output_directory << endl; this->aligned_output_directory = (path(record_root) / this->aligned_output_directory).string(); - CreateDirectory(aligned_output_directory); - - // Start the video and image writing thread - writing_threads.run([&] {AlignedImageWritingTask(); }); + CreateDirectory(aligned_output_directory); } this->frame_number = 0; - + closed = false; } RecorderOpenFace::RecorderOpenFace(const std::string in_filename, const RecorderOpenFaceParameters& parameters, std::vector& arguments):video_writer(), params(parameters) @@ -229,7 +276,7 @@ RecorderOpenFace::RecorderOpenFace(const std::string in_filename, const Recorder } -RecorderOpenFace::RecorderOpenFace(const std::string in_filename, const RecorderOpenFaceParameters& parameters, std::string output_directory):video_writer(), params(parameters) +RecorderOpenFace::RecorderOpenFace(const std::string in_filename, const RecorderOpenFaceParameters& parameters, std::string output_directory):video_writer(), params(parameters), closed(false) { // From the filename, strip out the name without directory and extension if (boost::filesystem::is_directory(in_filename)) @@ -260,87 +307,7 @@ void RecorderOpenFace::SetObservationVisualization(const cv::Mat &vis_track) { if (params.outputTracked()) { - // Initialize the video writer if it has not been opened yet - if(params.isSequence() && !video_writer.isOpened()) - { - std::string output_codec = params.outputCodec(); - try - { - video_writer.open(media_filename, CV_FOURCC(output_codec[0], output_codec[1], output_codec[2], output_codec[3]), params.outputFps(), vis_track.size(), true); - - if (!video_writer.isOpened()) - { - WARN_STREAM("Could not open VideoWriter, OUTPUT FILE WILL NOT BE WRITTEN."); - } - } - catch (cv::Exception e) - { - WARN_STREAM("Could not open VideoWriter, OUTPUT FILE WILL NOT BE WRITTEN. Currently using codec " << output_codec << ", try using an other one (-oc option)"); - } - - } vis_to_out = vis_track; - - } - -} - -void RecorderOpenFace::AlignedImageWritingTask() -{ - std::cout << "Aligned writing thread has started" << std::endl; - - while (recording || !aligned_face_queue.empty()) - { - std::pair tracked_data; - - while (aligned_face_queue.try_pop(tracked_data)) - { - bool write_success = cv::imwrite(tracked_data.first, tracked_data.second); - - if (!write_success) - { - WARN_STREAM("Could not output similarity aligned image image"); - } - } - std::cout << "sleeping while waiting to write, aligned face queue size" << aligned_face_queue.size() << std::endl; - - std::this_thread::sleep_for(std::chrono::milliseconds(100)); - } - -} - -void RecorderOpenFace::VideoWritingTask() -{ - std::cout << "Video writing thread has started" << std::endl; - - while(recording || !vis_to_out_queue.empty()) - { - - std::pair tracked_data; - - while (vis_to_out_queue.try_pop(tracked_data)) - { - if (params.isSequence()) - { - if (video_writer.isOpened()) - { - video_writer.write(tracked_data.second); - } - } - else - { - bool out_success = cv::imwrite(tracked_data.first, tracked_data.second); - if (!out_success) - { - WARN_STREAM("Could not output tracked image"); - } - } - } - - std::cout << "sleeping while waiting to write, video queue size" << vis_to_out_queue.size() << std::endl; - - std::this_thread::sleep_for(std::chrono::milliseconds(100)); - } } @@ -397,10 +364,16 @@ void RecorderOpenFace::WriteObservation() // Write aligned faces if (params.outputAlignedFaces()) { - if (frame_number == 1) + // To support both video and image input + if ((face_id == 0 && frame_number == 0) || (face_id == 0 && frame_number == 1)) { + int capacity = (1024 * 1024 * ALIGNED_QUEUE_CAPACITY) / (aligned_face.size().width *aligned_face.size().height * aligned_face.channels()); aligned_face_queue.set_capacity(capacity); + + // Start the alignment output thread + aligned_writing_thread = std::thread(&AlignedImageWritingTask, &aligned_face_queue); + } char name[100]; @@ -420,10 +393,7 @@ void RecorderOpenFace::WriteObservation() if(params.outputBadAligned() || landmark_detection_success) { - while (!aligned_face_queue.try_push(std::pair(out_file, aligned_face))) - { - std::this_thread::sleep_for(std::chrono::milliseconds(10)); - } + aligned_face_queue.push(std::pair(out_file, aligned_face)); } // Clear the image @@ -437,12 +407,35 @@ void RecorderOpenFace::WriteObservationTracked() { if (params.outputTracked()) { - - if (frame_number == 1) + // To support both video and image input + if ((!params.isSequence() && frame_number == 0) || (params.isSequence() && frame_number == 1)) { // Set up the queue for video writing based on output size int capacity = (1024 * 1024 * TRACKED_QUEUE_CAPACITY) / (vis_to_out.size().width * vis_to_out.size().height * vis_to_out.channels()); vis_to_out_queue.set_capacity(capacity); + + // Initialize the video writer if it has not been opened yet + if (params.isSequence()) + { + std::string output_codec = params.outputCodec(); + try + { + video_writer.open(media_filename, CV_FOURCC(output_codec[0], output_codec[1], output_codec[2], output_codec[3]), params.outputFps(), vis_to_out.size(), true); + + if (!video_writer.isOpened()) + { + WARN_STREAM("Could not open VideoWriter, OUTPUT FILE WILL NOT BE WRITTEN."); + } + } + catch (cv::Exception e) + { + WARN_STREAM("Could not open VideoWriter, OUTPUT FILE WILL NOT BE WRITTEN. Currently using codec " << output_codec << ", try using an other one (-oc option)"); + } + } + + // Start the video and tracked image writing thread + video_writing_thread = std::thread(&VideoWritingTask, &vis_to_out_queue, params.isSequence(), &video_writer); + } if (vis_to_out.empty()) @@ -452,19 +445,13 @@ void RecorderOpenFace::WriteObservationTracked() if (params.isSequence()) { - while (!vis_to_out_queue.try_push(std::pair("", vis_to_out))) - { - std::this_thread::sleep_for(std::chrono::milliseconds(20)); - } - + vis_to_out_queue.push(std::pair("", vis_to_out)); } else { - while (!vis_to_out_queue.try_push(std::pair(media_filename, vis_to_out))) - { - std::this_thread::sleep_for(std::chrono::milliseconds(20)); - } + vis_to_out_queue.push(std::pair(media_filename, vis_to_out)); } + // Clear the output vis_to_out = cv::Mat(); } @@ -535,16 +522,26 @@ RecorderOpenFace::~RecorderOpenFace() void RecorderOpenFace::Close() { - recording = false; - - // Make sure the recording threads complete - writing_threads.wait(); + if(!closed) + { - hog_recorder.Close(); - csv_recorder.Close(); - video_writer.release(); - metadata_file.close(); + // Insert terminating frames to the queues + vis_to_out_queue.push(std::pair("", cv::Mat())); + aligned_face_queue.push(std::pair("", cv::Mat())); + // Make sure the recording threads complete + if (video_writing_thread.joinable()) + video_writing_thread.join(); + + if (aligned_writing_thread.joinable()) + aligned_writing_thread.join(); + + hog_recorder.Close(); + csv_recorder.Close(); + video_writer.release(); + metadata_file.close(); + closed = true; + } } diff --git a/lib/local/Utilities/src/SequenceCapture.cpp b/lib/local/Utilities/src/SequenceCapture.cpp index ba397f51..507f7f63 100644 --- a/lib/local/Utilities/src/SequenceCapture.cpp +++ b/lib/local/Utilities/src/SequenceCapture.cpp @@ -269,7 +269,6 @@ bool SequenceCapture::OpenWebcam(int device, int image_width, int image_height, start_time = cv::getTickCount(); capturing = true; - //capture_threads.run([&] {CaptureThread(); }); return true; From 6569601652977062241216349318ea4c34d5f763 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Thu, 31 May 2018 08:15:23 +0100 Subject: [PATCH 12/16] CLR does not agree with C++ threads, so moving back to tbb task_group --- .gitignore | 6 +++--- lib/local/Utilities/include/RecorderOpenFace.h | 8 +++----- lib/local/Utilities/src/RecorderOpenFace.cpp | 14 ++++---------- lib/local/Utilities/src/SequenceCapture.cpp | 5 ++--- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 0bc69d61..64b4c844 100644 --- a/.gitignore +++ b/.gitignore @@ -49,6 +49,7 @@ exe/Recording/Release/ lib/local/GazeAnalyser/Release/ exe/FaceLandmarkImg/menpo_out/ /Release/ +/Debug/ matlab_runners/Demos/demo_img/ matlab_runners/Demos/demo_vid/ matlab_runners/Demos/output_features_seq/ @@ -93,7 +94,6 @@ matlab_runners/Demos/processed/ exe/releases/OpenFace_* *.suo .vs/OpenFace/v15/ - -build/ - +/build/ matlab_runners/Action Unit Experiments/AU_predictions/ +lib/local/Utilities/Debug/ diff --git a/lib/local/Utilities/include/RecorderOpenFace.h b/lib/local/Utilities/include/RecorderOpenFace.h index bbfb6c29..0b9505a1 100644 --- a/lib/local/Utilities/include/RecorderOpenFace.h +++ b/lib/local/Utilities/include/RecorderOpenFace.h @@ -49,9 +49,6 @@ #include #include -// Threading includes -#include - namespace Utilities { @@ -181,9 +178,10 @@ namespace Utilities cv::Mat aligned_face; tbb::concurrent_bounded_queue > aligned_face_queue; - std::thread video_writing_thread; - std::thread aligned_writing_thread; + // For keeping track of tasks + tbb::task_group writing_threads; + // TODO rem bool closed = false; }; diff --git a/lib/local/Utilities/src/RecorderOpenFace.cpp b/lib/local/Utilities/src/RecorderOpenFace.cpp index 11d77bd1..a4fc17a8 100644 --- a/lib/local/Utilities/src/RecorderOpenFace.cpp +++ b/lib/local/Utilities/src/RecorderOpenFace.cpp @@ -48,7 +48,6 @@ // For threading #include -#include using namespace boost::filesystem; @@ -371,9 +370,8 @@ void RecorderOpenFace::WriteObservation() int capacity = (1024 * 1024 * ALIGNED_QUEUE_CAPACITY) / (aligned_face.size().width *aligned_face.size().height * aligned_face.channels()); aligned_face_queue.set_capacity(capacity); - // Start the alignment output thread - aligned_writing_thread = std::thread(&AlignedImageWritingTask, &aligned_face_queue); - + // Start the alignment output thread + writing_threads.run([&] {AlignedImageWritingTask(&aligned_face_queue); }); } char name[100]; @@ -434,7 +432,7 @@ void RecorderOpenFace::WriteObservationTracked() } // Start the video and tracked image writing thread - video_writing_thread = std::thread(&VideoWritingTask, &vis_to_out_queue, params.isSequence(), &video_writer); + writing_threads.run([&] {VideoWritingTask(&vis_to_out_queue, params.isSequence(), &video_writer); }); } @@ -530,11 +528,7 @@ void RecorderOpenFace::Close() aligned_face_queue.push(std::pair("", cv::Mat())); // Make sure the recording threads complete - if (video_writing_thread.joinable()) - video_writing_thread.join(); - - if (aligned_writing_thread.joinable()) - aligned_writing_thread.join(); + writing_threads.wait(); hog_recorder.Close(); csv_recorder.Close(); diff --git a/lib/local/Utilities/src/SequenceCapture.cpp b/lib/local/Utilities/src/SequenceCapture.cpp index 507f7f63..4c9e2374 100644 --- a/lib/local/Utilities/src/SequenceCapture.cpp +++ b/lib/local/Utilities/src/SequenceCapture.cpp @@ -285,7 +285,7 @@ void SequenceCapture::Close() capture_threads.wait(); - // Empty the capture queue + // Empty the capture queue (in case a capture was cancelled and we still have frames in the queue) capture_queue.clear(); // Release the capture objects @@ -297,8 +297,7 @@ void SequenceCapture::Close() // Destructor that releases the capture SequenceCapture::~SequenceCapture() { - if (capture.isOpened()) - capture.release(); + Close(); } bool SequenceCapture::OpenVideoFile(std::string video_file, float fx, float fy, float cx, float cy) From 34067b01689b524ee0702c6eaea9b09ca6b50d71 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Thu, 31 May 2018 17:27:06 +0100 Subject: [PATCH 13/16] Debugging travis again. --- lib/local/Utilities/src/RecorderOpenFace.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/local/Utilities/src/RecorderOpenFace.cpp b/lib/local/Utilities/src/RecorderOpenFace.cpp index a4fc17a8..d6e20c5d 100644 --- a/lib/local/Utilities/src/RecorderOpenFace.cpp +++ b/lib/local/Utilities/src/RecorderOpenFace.cpp @@ -81,6 +81,7 @@ void CreateDirectory(std::string output_path) void VideoWritingTask(tbb::concurrent_bounded_queue > *writing_queue, bool is_sequence, cv::VideoWriter *video_writer) { + cout << "Video writing task started, queue capacity " << writing_queue->capacity() << endl; std::pair tracked_data; @@ -114,6 +115,8 @@ void VideoWritingTask(tbb::concurrent_bounded_queue > *writing_queue) { + cout << "Aligned writing task started, queue capacity " << writing_queue->capacity() << endl; + std::pair tracked_data; while (true) From 9b1db7321d1bb2518cfd633119a65b973bffe7ee Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Thu, 31 May 2018 17:48:52 +0100 Subject: [PATCH 14/16] More debugging. --- lib/local/Utilities/src/RecorderOpenFace.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/local/Utilities/src/RecorderOpenFace.cpp b/lib/local/Utilities/src/RecorderOpenFace.cpp index d6e20c5d..596f7526 100644 --- a/lib/local/Utilities/src/RecorderOpenFace.cpp +++ b/lib/local/Utilities/src/RecorderOpenFace.cpp @@ -406,8 +406,12 @@ void RecorderOpenFace::WriteObservation() void RecorderOpenFace::WriteObservationTracked() { + cout << "WriteObservationTracked called" << endl; + if (params.outputTracked()) { + cout << "Track should be output" << endl; + // To support both video and image input if ((!params.isSequence() && frame_number == 0) || (params.isSequence() && frame_number == 1)) { @@ -435,6 +439,7 @@ void RecorderOpenFace::WriteObservationTracked() } // Start the video and tracked image writing thread + cout << "About to create a writing thread" << endl; writing_threads.run([&] {VideoWritingTask(&vis_to_out_queue, params.isSequence(), &video_writer); }); } From 0517bbbd72f52d95e6d1168e2c2bfdc5fd0560a0 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Thu, 31 May 2018 20:57:20 +0100 Subject: [PATCH 15/16] Separating threading on unix and windows systems. --- .../Utilities/include/RecorderOpenFace.h | 13 ++++- lib/local/Utilities/src/RecorderOpenFace.cpp | 48 +++++++++++-------- 2 files changed, 40 insertions(+), 21 deletions(-) diff --git a/lib/local/Utilities/include/RecorderOpenFace.h b/lib/local/Utilities/include/RecorderOpenFace.h index 0b9505a1..3b87de52 100644 --- a/lib/local/Utilities/include/RecorderOpenFace.h +++ b/lib/local/Utilities/include/RecorderOpenFace.h @@ -49,6 +49,12 @@ #include #include +#ifdef _WIN32 + +#else + #include +#endif + namespace Utilities { @@ -178,11 +184,14 @@ namespace Utilities cv::Mat aligned_face; tbb::concurrent_bounded_queue > aligned_face_queue; +#ifdef _WIN32 // For keeping track of tasks tbb::task_group writing_threads; +#else + std::thread video_writing_thread; + std::thread aligned_writing_thread; +#endif - // TODO rem - bool closed = false; }; } diff --git a/lib/local/Utilities/src/RecorderOpenFace.cpp b/lib/local/Utilities/src/RecorderOpenFace.cpp index 596f7526..2b364eab 100644 --- a/lib/local/Utilities/src/RecorderOpenFace.cpp +++ b/lib/local/Utilities/src/RecorderOpenFace.cpp @@ -215,7 +215,6 @@ void RecorderOpenFace::PrepareRecording(const std::string& in_filename) } this->frame_number = 0; - closed = false; } RecorderOpenFace::RecorderOpenFace(const std::string in_filename, const RecorderOpenFaceParameters& parameters, std::vector& arguments):video_writer(), params(parameters) @@ -278,7 +277,7 @@ RecorderOpenFace::RecorderOpenFace(const std::string in_filename, const Recorder } -RecorderOpenFace::RecorderOpenFace(const std::string in_filename, const RecorderOpenFaceParameters& parameters, std::string output_directory):video_writer(), params(parameters), closed(false) +RecorderOpenFace::RecorderOpenFace(const std::string in_filename, const RecorderOpenFaceParameters& parameters, std::string output_directory):video_writer(), params(parameters) { // From the filename, strip out the name without directory and extension if (boost::filesystem::is_directory(in_filename)) @@ -374,7 +373,13 @@ void RecorderOpenFace::WriteObservation() aligned_face_queue.set_capacity(capacity); // Start the alignment output thread +#ifdef _WIN32 + // For keeping track of tasks writing_threads.run([&] {AlignedImageWritingTask(&aligned_face_queue); }); +#else + // Start the alignment output thread + aligned_writing_thread = std::thread(&AlignedImageWritingTask, &aligned_face_queue); +#endif } char name[100]; @@ -406,12 +411,9 @@ void RecorderOpenFace::WriteObservation() void RecorderOpenFace::WriteObservationTracked() { - cout << "WriteObservationTracked called" << endl; if (params.outputTracked()) { - cout << "Track should be output" << endl; - // To support both video and image input if ((!params.isSequence() && frame_number == 0) || (params.isSequence() && frame_number == 1)) { @@ -439,8 +441,13 @@ void RecorderOpenFace::WriteObservationTracked() } // Start the video and tracked image writing thread - cout << "About to create a writing thread" << endl; +#ifdef _WIN32 + // For keeping track of tasks writing_threads.run([&] {VideoWritingTask(&vis_to_out_queue, params.isSequence(), &video_writer); }); +#else + video_writing_thread = std::thread(&VideoWritingTask, &vis_to_out_queue, params.isSequence(), &video_writer); +#endif + } @@ -528,22 +535,25 @@ RecorderOpenFace::~RecorderOpenFace() void RecorderOpenFace::Close() { - if(!closed) - { + // Insert terminating frames to the queues + vis_to_out_queue.push(std::pair("", cv::Mat())); + aligned_face_queue.push(std::pair("", cv::Mat())); - // Insert terminating frames to the queues - vis_to_out_queue.push(std::pair("", cv::Mat())); - aligned_face_queue.push(std::pair("", cv::Mat())); + // Make sure the recording threads complete +#ifdef _WIN32 + writing_threads.wait(); +#else + if (video_writing_thread.joinable()) + video_writing_thread.join(); + if (aligned_writing_thread.joinable()) + aligned_writing_thread.join(); +#endif - // Make sure the recording threads complete - writing_threads.wait(); - hog_recorder.Close(); - csv_recorder.Close(); - video_writer.release(); - metadata_file.close(); - closed = true; - } + hog_recorder.Close(); + csv_recorder.Close(); + video_writer.release(); + metadata_file.close(); } From e52fe4e4477e64a0d56a8d8732f43d8ea5003efa Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Thu, 31 May 2018 21:40:27 +0100 Subject: [PATCH 16/16] A bit of cleanup, also making sure that even for huge files, multi-threading would work. --- lib/local/Utilities/src/RecorderOpenFace.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/local/Utilities/src/RecorderOpenFace.cpp b/lib/local/Utilities/src/RecorderOpenFace.cpp index 2b364eab..9b64a9ba 100644 --- a/lib/local/Utilities/src/RecorderOpenFace.cpp +++ b/lib/local/Utilities/src/RecorderOpenFace.cpp @@ -81,7 +81,6 @@ void CreateDirectory(std::string output_path) void VideoWritingTask(tbb::concurrent_bounded_queue > *writing_queue, bool is_sequence, cv::VideoWriter *video_writer) { - cout << "Video writing task started, queue capacity " << writing_queue->capacity() << endl; std::pair tracked_data; @@ -115,7 +114,6 @@ void VideoWritingTask(tbb::concurrent_bounded_queue > *writing_queue) { - cout << "Aligned writing task started, queue capacity " << writing_queue->capacity() << endl; std::pair tracked_data; @@ -369,7 +367,7 @@ void RecorderOpenFace::WriteObservation() if ((face_id == 0 && frame_number == 0) || (face_id == 0 && frame_number == 1)) { - int capacity = (1024 * 1024 * ALIGNED_QUEUE_CAPACITY) / (aligned_face.size().width *aligned_face.size().height * aligned_face.channels()); + int capacity = (1024 * 1024 * ALIGNED_QUEUE_CAPACITY) / (aligned_face.size().width *aligned_face.size().height * aligned_face.channels()) + 1; aligned_face_queue.set_capacity(capacity); // Start the alignment output thread @@ -418,7 +416,7 @@ void RecorderOpenFace::WriteObservationTracked() if ((!params.isSequence() && frame_number == 0) || (params.isSequence() && frame_number == 1)) { // Set up the queue for video writing based on output size - int capacity = (1024 * 1024 * TRACKED_QUEUE_CAPACITY) / (vis_to_out.size().width * vis_to_out.size().height * vis_to_out.channels()); + int capacity = (1024 * 1024 * TRACKED_QUEUE_CAPACITY) / (vis_to_out.size().width * vis_to_out.size().height * vis_to_out.channels()) + 1; vis_to_out_queue.set_capacity(capacity); // Initialize the video writer if it has not been opened yet