Small interface change

Author: Yuval Nirkin

face_swap_batch/face_swap_batch.cfg

@@ -1,6 +1,12 @@
 landmarks = ../data/shape_predictor_68_face_landmarks.dat
-model = ../data/BaselFaceModel_mod_wForehead_noEars.h5
-model2 = ../data/BaselFace.dat
-caffemodel = ../data/3dmm_cnn_resnet_101.caffemodel
-deploy = ../data/deploy_network.prototxt
-mean = ../data/mean.binaryproto
+model_3dmm_h5 = ../data/BaselFaceModel_mod_wForehead_noEars.h5
+model_3dmm_dat = ../data/BaselFace.dat
+reg_model = ../data/3dmm_cnn_resnet_101.caffemodel
+reg_deploy = ../data/3dmm_cnn_resnet_101_deploy.prototxt
+reg_mean = ../data/3dmm_cnn_resnet_101_mean.binaryproto
+seg_model = ../data/face_seg_fcn8s.caffemodel
+seg_deploy = ../data/face_seg_fcn8s_deploy.prototxt
+generic = 0
+expressions = 1
+gpu = 1
+gpu_id = 0

face_swap_batch/face_swap_batch.cpp

@@ -121,7 +121,7 @@ int main(int argc, char* argv[])
 			("landmarks,l", value<string>(&landmarks_path)->required(), "path to landmarks model file")
 			("model_3dmm_h5", value<string>(&model_3dmm_h5_path)->required(), "path to 3DMM file (.h5)")
 			("model_3dmm_dat", value<string>(&model_3dmm_dat_path)->required(), "path to 3DMM file (.dat)")
-			("reg_caffemodel,c", value<string>(&reg_model_path)->required(), "path to 3DMM regression CNN model file (.caffemodel)")
+			("reg_model,r", value<string>(&reg_model_path)->required(), "path to 3DMM regression CNN model file (.caffemodel)")
 			("reg_deploy,d", value<string>(&reg_deploy_path)->required(), "path to 3DMM regression CNN deploy file (.prototxt)")
 			("reg_mean,m", value<string>(&reg_mean_path)->required(), "path to 3DMM regression CNN mean file (.binaryproto)")
 			("seg_model", value<string>(&seg_model_path), "path to face segmentation CNN model file (.caffemodel)")

face_swap_image/face_swap_image.cfg

@@ -1,6 +1,12 @@
 landmarks = ../data/shape_predictor_68_face_landmarks.dat
-model = ../data/BaselFaceModel_mod_wForehead_noEars.h5
-model2 = ../data/BaselFace.dat
-caffemodel = ../data/3dmm_cnn_resnet_101.caffemodel
-deploy = ../data/deploy_network.prototxt
-mean = ../data/mean.binaryproto
+model_3dmm_h5 = ../data/BaselFaceModel_mod_wForehead_noEars.h5
+model_3dmm_dat = ../data/BaselFace.dat
+reg_model = ../data/3dmm_cnn_resnet_101.caffemodel
+reg_deploy = ../data/3dmm_cnn_resnet_101_deploy.prototxt
+reg_mean = ../data/3dmm_cnn_resnet_101_mean.binaryproto
+seg_model = ../data/face_seg_fcn8s.caffemodel
+seg_deploy = ../data/face_seg_fcn8s_deploy.prototxt
+generic = 0
+expressions = 1
+gpu = 1
+gpu_id = 0

face_swap_image/face_swap_image.cpp

@@ -57,7 +57,7 @@ int main(int argc, char* argv[])
 			("landmarks,l", value<string>(&landmarks_path)->required(), "path to landmarks model file")
             ("model_3dmm_h5", value<string>(&model_3dmm_h5_path)->required(), "path to 3DMM file (.h5)")
             ("model_3dmm_dat", value<string>(&model_3dmm_dat_path)->required(), "path to 3DMM file (.dat)")
-            ("reg_caffemodel,c", value<string>(&reg_model_path)->required(), "path to 3DMM regression CNN model file (.caffemodel)")
+            ("reg_model,r", value<string>(&reg_model_path)->required(), "path to 3DMM regression CNN model file (.caffemodel)")
             ("reg_deploy,d", value<string>(&reg_deploy_path)->required(), "path to 3DMM regression CNN deploy file (.prototxt)")
             ("reg_mean,m", value<string>(&reg_mean_path)->required(), "path to 3DMM regression CNN mean file (.binaryproto)")
 			("seg_model", value<string>(&seg_model_path), "path to face segmentation CNN model file (.caffemodel)")