Bug fix with default recording directory.

This commit is contained in:
Tadas Baltrusaitis 2017-11-17 07:54:22 +00:00
parent 694dfb28ba
commit 5a483f7486
5 changed files with 11 additions and 6 deletions

View file

@ -104,7 +104,8 @@ namespace Utilities
const RecorderOpenFaceParameters params; const RecorderOpenFaceParameters params;
// Keep track of the file and output root location // Keep track of the file and output root location
std::string record_root = "processed"; // By default we are writing in the processed directory in the working directory std::string record_root;
std::string default_record_directory = "processed"; // By default we are writing in the processed directory in the working directory, if no output parameters provided
std::string of_filename; std::string of_filename;
std::string filename; std::string filename;
std::string csv_filename; std::string csv_filename;

View file

@ -109,6 +109,10 @@ RecorderOpenFace::RecorderOpenFace(const std::string in_filename, RecorderOpenFa
} }
} }
// If recording directory not set, record to default location
if (record_root.empty())
record_root = default_record_directory;
for (int i = (int)arguments.size() - 1; i >= 0; --i) for (int i = (int)arguments.size() - 1; i >= 0; --i)
{ {
if (!valid[i]) if (!valid[i])

View file

@ -73,7 +73,7 @@ RecorderOpenFaceParameters::RecorderOpenFaceParameters(std::vector<std::string>
output_AUs = false; output_AUs = false;
output_gaze = false; output_gaze = false;
output_hog = false; output_hog = false;
output_tracked_video = false; output_tracked = false;
output_aligned_faces = false; output_aligned_faces = false;
for (size_t i = 0; i < arguments.size(); ++i) for (size_t i = 0; i < arguments.size(); ++i)
@ -120,7 +120,7 @@ RecorderOpenFaceParameters::RecorderOpenFaceParameters(std::vector<std::string>
} }
else if (arguments[i].compare("-tracked") == 0) else if (arguments[i].compare("-tracked") == 0)
{ {
output_tracked_video = true; output_tracked = true;
output_set = true; output_set = true;
} }
} }
@ -136,7 +136,7 @@ RecorderOpenFaceParameters::RecorderOpenFaceParameters(std::vector<std::string>
output_AUs = true; output_AUs = true;
output_gaze = true; output_gaze = true;
output_hog = true; output_hog = true;
output_tracked_video = true; output_tracked = true;
output_aligned_faces = true; output_aligned_faces = true;
} }

View file

@ -14,7 +14,7 @@ dbSeqDir = dbSeqDir(3:end);
output_dir = cat(2, output_dir, '/'); output_dir = cat(2, output_dir, '/');
command = sprintf('%s -inroot "%s" -outroot "%s" -fx 505 -fy 505 -cx 320 -cy 240 -pose -vis-track ', executable, rootDir, output_dir); command = sprintf('%s -inroot "%s" -out_dir "%s" -fx 505 -fy 505 -cx 320 -cy 240 -pose -vis-track ', executable, rootDir, output_dir);
if(verbose) if(verbose)
command = cat(2, command, [' -tracked ' outputVideo]); command = cat(2, command, [' -tracked ' outputVideo]);

View file

@ -15,7 +15,7 @@ dbSeqDir = dbSeqDir(3:end);
output_dir = cat(2, output_dir, '/'); output_dir = cat(2, output_dir, '/');
command = sprintf('%s -inroot "%s" -outroot "%s" -fx 535 -fy 536 -cx 327 -cy 241 -pose -vis-track ', executable, rootDir, output_dir); command = sprintf('%s -inroot "%s" -out_dir "%s" -fx 535 -fy 536 -cx 327 -cy 241 -pose -vis-track ', executable, rootDir, output_dir);
if(verbose) if(verbose)
command = cat(2, command, [' -tracked ' outputVideo]); command = cat(2, command, [' -tracked ' outputVideo]);