Merge branch 'feature/separate_recorder' of https://github.com/TadasBaltrusaitis/OpenFace into feature/separate_recorder

This commit is contained in:
Tadas Baltrusaitis 2017-11-14 20:07:37 +00:00
commit d28342a5d6

View file

@ -26,15 +26,14 @@ database_root = [database_root, '/ytceleb/'];
in_vids = dir([database_root '/*.avi']); in_vids = dir([database_root '/*.avi']);
command = executable; command = sprintf('%s -2Dfp -out_dir "%s" ', executable, output);
command = cat(2, command, ' -2Dfp ');
% add all videos to single argument list (so as not to load the model anew % add all videos to single argument list (so as not to load the model anew
% for every video) % for every video)
for i=1:numel(in_vids) for i=1:numel(in_vids)
in_file_name = [database_root, '/', in_vids(i).name]; in_file_name = [database_root, '/', in_vids(i).name];
command = cat(2, command, [' -f "' in_file_name '" -of "' output '"']); command = cat(2, command, [' -f "' in_file_name '" ']);
end end
if(isunix) if(isunix)
@ -50,15 +49,13 @@ if(~exist(output, 'file'))
mkdir(output) mkdir(output)
end end
command = executable; command = sprintf('%s -2Dfp -out_dir "%s -mloc model/main_clm_general.txt " ', executable, output);
command = cat(2, command, ' -mloc model/main_clm_general.txt ');
command = cat(2, command, ' -2Dfp ');
% add all videos to single argument list (so as not to load the model anew % add all videos to single argument list (so as not to load the model anew
% for every video) % for every video)
for i=1:numel(in_vids) for i=1:numel(in_vids)
in_file_name = [database_root, '/', in_vids(i).name]; in_file_name = [database_root, '/', in_vids(i).name];
command = cat(2, command, [' -f "' in_file_name '" -of "' output '"']); command = cat(2, command, [' -f "' in_file_name '"']);
end end
if(isunix) if(isunix)