Working towards better metafile information.

This commit is contained in:
Tadas Baltrusaitis 2017-12-04 11:48:44 +00:00
parent aba30079e6
commit 1d3f32b7df
3 changed files with 31 additions and 3 deletions

View File

@ -95,6 +95,9 @@ namespace Utilities
double time_stamp; double time_stamp;
std::string input_name_relative;
std::string input_name_full;
// Name of the video file, image directory, or the webcam // Name of the video file, image directory, or the webcam
std::string name; std::string name;

View File

@ -76,7 +76,7 @@ RecorderOpenFace::RecorderOpenFace(const std::string in_filename, RecorderOpenFa
{ {
// From the filename, strip out the name without directory and extension // From the filename, strip out the name without directory and extension
filename = path(in_filename).replace_extension("").filename().string(); filename = path(string(in_filename)).replace_extension("").filename().string();
// Consuming the input arguments // Consuming the input arguments
bool* valid = new bool[arguments.size()]; bool* valid = new bool[arguments.size()];

View File

@ -156,17 +156,28 @@ bool SequenceCapture::Open(std::vector<std::string>& arguments)
no_input_specified = !file_found; no_input_specified = !file_found;
// Based on what was read in open the sequence TODO // Based on what was read in open the sequence TODO
if (device != -1) if (device != -1)
{ {
input_name_relative = "webcam";
input_name_full = "webcam";
return OpenWebcam(device, 640, 480, fx, fy, cx, cy); return OpenWebcam(device, 640, 480, fx, fy, cx, cy);
} }
if (!input_video_file.empty()) if (!input_video_file.empty())
{ {
input_name_relative = input_video_file;
if (boost::filesystem::path(input_name_relative).is_absolute())
{
input_name_full = input_name_relative;
}
boost::filesystem::path(input_name_full).is_absolute();
return OpenVideoFile(input_video_file, fx, fy, cx, cy); return OpenVideoFile(input_video_file, fx, fy, cx, cy);
} }
if (!input_sequence_directory.empty()) if (!input_sequence_directory.empty())
{ {
input_name_relative = input_sequence_directory;
return OpenImageSequence(input_sequence_directory, fx, fy, cx, cy); return OpenImageSequence(input_sequence_directory, fx, fy, cx, cy);
} }
@ -176,6 +187,20 @@ bool SequenceCapture::Open(std::vector<std::string>& arguments)
return false; return false;
} }
// Get current date/time, format is YYYY-MM-DD.HH:mm, useful for saving data from webcam
const std::string currentDateTime() {
time_t now = time(0);
struct tm tstruct;
char buf[200];
localtime_s(&tstruct, &now);
// Visit http://www.cplusplus.com/reference/clibrary/ctime/strftime/
// for more information about date/time format
strftime(buf, sizeof(buf), "%Y-%m-%d-%H-%M", &tstruct);
return buf;
}
bool SequenceCapture::OpenWebcam(int device, int image_width, int image_height, float fx, float fy, float cx, float cy) bool SequenceCapture::OpenWebcam(int device, int image_width, int image_height, float fx, float fy, float cx, float cy)
{ {
INFO_STREAM("Attempting to read from webcam: " << device); INFO_STREAM("Attempting to read from webcam: " << device);
@ -224,8 +249,8 @@ bool SequenceCapture::OpenWebcam(int device, int image_width, int image_height,
} }
SetCameraIntrinsics(fx, fy, cx, cy); SetCameraIntrinsics(fx, fy, cx, cy);
std::string time = currentDateTime();
this->name = "webcam"; // TODO number this->name = "webcam_" + time;
start_time = cv::getTickCount(); start_time = cv::getTickCount();