r
/
sustaining_gazes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sequence capture fix and landmark vid simplification.

This commit is contained in:
Tadas Baltrusaitis 2017-11-10 19:01:43 +00:00
parent d5a3af7ece
commit db5b5fceda
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
exe/FaceLandmarkVid/FaceLandmarkVid.cpp
View File

@ -161,9 +161,7 @@ int main (int argc, char **argv)
{
// The sequence reader chooses what to open based on command line arguments provided
bool reader_opened = sequence_reader.Open(arguments);
if(!reader_opened && sequence_reader.no_input_specified)
if(!sequence_reader.Open(arguments) && sequence_reader.no_input_specified)
{
// If that fails, revert to webcam
INFO_STREAM("No input specified, attempting to open a webcam 0");
@ -178,17 +176,14 @@ int main (int argc, char **argv)
INFO_STREAM("Device or file opened");
cv::Mat captured_image;
cv::Mat captured_image;
captured_image = sequence_reader.GetNextFrame();
cv::Mat captured_image = sequence_reader.GetNextFrame();
INFO_STREAM("Starting tracking");
while (!captured_image.empty()) // this is not a for loop as we might also be reading from a webcam
{
// Reading the images
cv::Mat_<uchar> grayscale_image;
cv::Mat_<uchar> grayscale_image = sequence_reader.GetGrayFrame();
// The actual facial landmark detection / tracking
bool detection_success = LandmarkDetector::DetectLandmarksInVideo(grayscale_image, clnf_model, det_parameters);

2
lib/local/Utilities/src/SequenceCapture.cpp
View File

@ -219,7 +219,7 @@ bool SequenceCapture::OpenWebcam(int device, int image_width, int image_height,
// Check if fps is nan or less than 0
if (fps != fps || fps <= 0)
{
INFO_STREAM("FPS of the video file cannot be determined, assuming 30");
INFO_STREAM("FPS of the webcam cannot be determined, assuming 30");
fps = 30;
}