ZF/OpenFace
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/ope/OpenFace.git synced 2026-05-14 19:27:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

A couple of bug fixes:

Browse Source 
- progress reporting in sequence capture when not opening from command line arguments
- stop button and closing the app works when multiple videos have been opened
This commit is contained in:
Tadas Baltrusaitis
2018-01-24 18:58:12 +00:00
parent 6dae14ac6b
commit 7addeffdea
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,8 +73,6 @@ bool SequenceCapture::Open(std::vector<std::string>& arguments)
// Some default values
std::string input_root = "";
fx = -1; fy = -1; cx = -1; cy = -1;
frame_num = 0;
time_stamp = 0;
std::string separator = std::string(1, boost::filesystem::path::preferred_separator);
@@ -204,6 +202,8 @@ bool SequenceCapture::OpenWebcam(int device, int image_width, int image_height,
INFO_STREAM("Attempting to read from webcam: " << device);
no_input_specified = false;
frame_num = 0;
time_stamp = 0;
if (device < 0)
{
@@ -268,6 +268,8 @@ bool SequenceCapture::OpenVideoFile(std::string video_file, float fx, float fy,
INFO_STREAM("Attempting to read from file: " << video_file);
no_input_specified = false;
frame_num = 0;
time_stamp = 0;
latest_frame = cv::Mat();
latest_gray_frame = cv::Mat();
@@ -310,6 +312,8 @@ bool SequenceCapture::OpenImageSequence(std::string directory, float fx, float f
INFO_STREAM("Attempting to read from directory: " << directory);
no_input_specified = false;
frame_num = 0;
time_stamp = 0;
image_files.clear();
@@ -443,6 +447,8 @@ double SequenceCapture::GetProgress()
}
else
{
//TODO test here
std::cout << frame_num << " " << vid_length << std::endl;
return (double)frame_num / (double)vid_length;
}
}