summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--options/dataset_options.py7
-rw-r--r--test-mogrify.py14
2 files changed, 13 insertions, 8 deletions
diff --git a/options/dataset_options.py b/options/dataset_options.py
index 5c90d86..0040540 100644
--- a/options/dataset_options.py
+++ b/options/dataset_options.py
@@ -59,6 +59,13 @@ class DatasetOptions(BaseOptions):
help='scp destination'
)
+ self.parser.add_argument(
+ '--experiment',
+ type=str,
+ default="",
+ help='experiment name'
+ )
+
## IMAGE FILTERS
### RECURSION
diff --git a/test-mogrify.py b/test-mogrify.py
index ee8111b..9a64bfc 100644
--- a/test-mogrify.py
+++ b/test-mogrify.py
@@ -13,7 +13,7 @@ from scipy.misc import imresize
from shutil import copyfile, rmtree
import numpy as np
import cv2
-import time
+import datetime
import subprocess
from time import sleep
@@ -27,7 +27,7 @@ if __name__ == '__main__':
opt.no_flip = True # no flip
opt.experiment = opt.start_img.split("/")[-1].split(".")[0]
- render_dir = opt.results_dir + opt.name + "/exp:" + opt.experiment + "/"
+ render_dir = opt.results_dir + opt.name + "/" + data_opt.experiment + "/"
if os.path.exists(render_dir):
rmtree(render_dir)
@@ -116,14 +116,12 @@ if __name__ == '__main__':
os.remove(render_dir + "frame_00000.png")
- t = time.time()
- t /= 60
- t %= 525600
- video_fn = "{}_{}_{}_mogrify.mp4".format(
- opt.name, opt.experiment,
+ d = datetime.now()
+ video_fn = "{}_{}_{}_{}_mogrify.mp4".format(
+ opt.name, opt.experiment, data_opt.experiment,
# opt.how_many, frac_a,
# blur, sigma, canny_lo, canny_hi,
- int(t))
+ d.strftime('%Y%m%d%H%M'))
cmd = ("ffmpeg", "-i", render_dir + "ren_%05d.png", "-y", "-c:v", "libx264", "-vf", "fps=30", "-pix_fmt", "yuv420p", render_dir + video_fn)
process = subprocess.Popen(cmd, stdout=subprocess.PIPE)