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);