From 1f9873eeda8f59a7fabe0197728a00daa3c9bfe8 Mon Sep 17 00:00:00 2001 From: Umang Mehta Date: Fri, 16 Nov 2018 12:44:22 -0500 Subject: [PATCH 1/2] Moving the setting of the classifier path before initializing the classifiers --- opencv-webcam-demo/opencv-webcam-demo.cpp | 4 ++-- video-demo/video-demo.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opencv-webcam-demo/opencv-webcam-demo.cpp b/opencv-webcam-demo/opencv-webcam-demo.cpp index 1615e65..12912a7 100644 --- a/opencv-webcam-demo/opencv-webcam-demo.cpp +++ b/opencv-webcam-demo/opencv-webcam-demo.cpp @@ -113,11 +113,11 @@ int main(int argsc, char ** argsv) frameDetector = make_shared(buffer_length, process_framerate, nFaces, (affdex::FaceDetectorMode) faceDetectorMode); // Init the FrameDetector Class //Initialize detectors - frameDetector->setDetectAllEmotions(true); + frameDetector->setClassifierPath(DATA_FOLDER); + frameDetector->setDetectAllEmotions(true); frameDetector->setDetectAllExpressions(true); frameDetector->setDetectAllEmojis(true); frameDetector->setDetectAllAppearances(true); - frameDetector->setClassifierPath(DATA_FOLDER); frameDetector->setImageListener(listenPtr.get()); frameDetector->setFaceListener(faceListenPtr.get()); frameDetector->setProcessStatusListener(videoListenPtr.get()); diff --git a/video-demo/video-demo.cpp b/video-demo/video-demo.cpp index 5746eff..f9c7416 100644 --- a/video-demo/video-demo.cpp +++ b/video-demo/video-demo.cpp @@ -135,11 +135,11 @@ int main(int argsc, char ** argsv) std::cout << "Face detector mode set to: " << mode << std::endl; shared_ptr listenPtr(new PlottingImageListener(csvFileStream, draw_display)); + detector->setClassifierPath(DATA_FOLDER); detector->setDetectAllEmotions(true); detector->setDetectAllExpressions(true); - detector->setDetectAllEmojis(true); + detector->setDetectAllEmojis(true); detector->setDetectAllAppearances(true); - detector->setClassifierPath(DATA_FOLDER); detector->setImageListener(listenPtr.get()); From d5aac13e2828ad79a10283be2520d764002b3438 Mon Sep 17 00:00:00 2001 From: Umang Mehta Date: Fri, 16 Nov 2018 14:47:29 -0500 Subject: [PATCH 2/2] Fixup --- opencv-webcam-demo/opencv-webcam-demo.cpp | 8 ++++---- video-demo/video-demo.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opencv-webcam-demo/opencv-webcam-demo.cpp b/opencv-webcam-demo/opencv-webcam-demo.cpp index 12912a7..27db0bd 100644 --- a/opencv-webcam-demo/opencv-webcam-demo.cpp +++ b/opencv-webcam-demo/opencv-webcam-demo.cpp @@ -19,9 +19,9 @@ using namespace std; using namespace affdex; -/// -/// Project for demoing the Windows SDK CameraDetector class (grabbing and processing frames from the camera). -/// +/// +/// Project for demoing the Windows SDK CameraDetector class (grabbing and processing frames from the camera). +/// int main(int argsc, char ** argsv) { namespace po = boost::program_options; // abbreviate namespace @@ -114,7 +114,7 @@ int main(int argsc, char ** argsv) //Initialize detectors frameDetector->setClassifierPath(DATA_FOLDER); - frameDetector->setDetectAllEmotions(true); + frameDetector->setDetectAllEmotions(true); frameDetector->setDetectAllExpressions(true); frameDetector->setDetectAllEmojis(true); frameDetector->setDetectAllAppearances(true); diff --git a/video-demo/video-demo.cpp b/video-demo/video-demo.cpp index f9c7416..0bb6465 100644 --- a/video-demo/video-demo.cpp +++ b/video-demo/video-demo.cpp @@ -135,10 +135,10 @@ int main(int argsc, char ** argsv) std::cout << "Face detector mode set to: " << mode << std::endl; shared_ptr listenPtr(new PlottingImageListener(csvFileStream, draw_display)); - detector->setClassifierPath(DATA_FOLDER); + detector->setClassifierPath(DATA_FOLDER); detector->setDetectAllEmotions(true); detector->setDetectAllExpressions(true); - detector->setDetectAllEmojis(true); + detector->setDetectAllEmojis(true); detector->setDetectAllAppearances(true); detector->setImageListener(listenPtr.get());