diff options
| -rw-r--r-- | crop_frames.py | 7 | ||||
| -rw-r--r-- | merge_frames.py | 6 | ||||
| -rw-r--r-- | test.py | 10 |
3 files changed, 11 insertions, 12 deletions
diff --git a/crop_frames.py b/crop_frames.py index d939d9d..c22adb4 100644 --- a/crop_frames.py +++ b/crop_frames.py @@ -9,7 +9,6 @@ from PIL import Image parser = argparse.ArgumentParser() parser.add_argument('--step', default=256, type=int) parser.add_argument('--overlap', default=2, type=int) -parser.add_argument('--scale', default=4, type=int) parser.add_argument('--in_dir', help='Directory to process') parser.add_argument('--out_dir', default='inputs', help='Directory to output to') args = parser.parse_args() @@ -19,7 +18,7 @@ def crop_dir(): overlap = args.overlap side = step + overlap * 2 files = glob.glob('{}/*.png'.format(args.in_dir)) - print(files) + # print(files) img = Image.open(files[0]) width, height = img.size @@ -30,7 +29,7 @@ def crop_dir(): yy = max(0, y - overlap) w = min(side, width - xx) h = min(side, height - yy) - crop_dir = "{}/crop_{}_{}_{}_{}".format(args.out_dir, xx, yy, w, h) + crop_dir = "{}/crop_{}_{}_{}_{}".format(args.out_dir, x, y, w, h) if os.path.exists(crop_dir): rmtree(crop_dir) os.makedirs(crop_dir) @@ -52,7 +51,7 @@ def crop_image(raw_fn, width, height, step, side, overlap): yy = max(0, y - overlap) w = min(side, width - xx) h = min(side, height - yy) - crop_dir = "{}/crop_{}_{}_{}_{}".format(args.out_dir, xx, yy, w, h) + crop_dir = "{}/crop_{}_{}_{}_{}".format(args.out_dir, x, y, w, h) # print("{}x{} {}x{}".format(x, y, w, h)) crop = img.crop((xx, yy, xx + w, yy + h)) crop.save("{}/{}".format(crop_dir, fn)) diff --git a/merge_frames.py b/merge_frames.py index ed7b9ff..c413b97 100644 --- a/merge_frames.py +++ b/merge_frames.py @@ -25,7 +25,7 @@ def merge_files(file, crop_dir_list, ww, hh, overlap, merge_dir): crop_dir = "crop_{}_{}_{}_{}".format(x, y, w, h) image = Image.open("{}/{}/{}".format(args.dir, crop_dir, fn)) crop = image.crop((overlap, overlap, image.size[0] - overlap * 2, image.size[1] - overlap * 2)) - canvas.paste(image, (x * args.scale, y * args.scale,)) + canvas.paste(crop, (x * args.scale, y * args.scale,)) canvas.save("{}/{}".format(merge_dir, fn)) def merge_dir(): @@ -48,11 +48,11 @@ def merge_dir(): crop_dir_list.append((x, y, w, h,)) crop_dir_list = sorted(crop_dir_list, key=operator.itemgetter(0, 1)) - print("{}x{}".format(ww, hh)) - ww *= args.scale hh *= args.scale + print("{}x{}".format(ww, hh)) + files = sorted(glob.glob("{}/*.png".format(crop_dirs[0]))) dataset = [] for file in files: @@ -17,9 +17,9 @@ parser = argparse.ArgumentParser() parser.add_argument('--L', metavar='L', type=int, default=choice([16, 28, 52]), help='Network depth: One of 16, 28, 52') parser.add_argument('--T', metavar='T', default='L', help='Input type: L(Low-resolution) or G(Ground-truth)') parser.add_argument('--in_dir', metavar='in_dir', default=None, help='Directory to process') -parser.add_argument('--out_dir', metavar='out_dir', default='/media/blue/uprez', help='Directory to output to') +parser.add_argument('--out_dir', metavar='out_dir', default='/media/blue/uprez/results', help='Directory to output to') parser.add_argument('--network_dir', default='.', help='Path to networks') -parser.add_argument('--no_mov', action='store_true') +parser.add_argument('--mov_from_dirs', action='store_true') args = parser.parse_args() # Size of input temporal radius @@ -46,13 +46,13 @@ def process_dir(dir): dataset = dir_partz[-2] part = dir_partz[-1] tag = '_'.join([dataset, str(args.L) + 'L', part]) - out_path = os.path.join(args.out_dir, 'results', dataset, str(args.L) + 'L', part) + out_path = os.path.join(args.out_dir, dataset, str(args.L) + 'L', part) render_path = os.path.join(args.out_dir, 'renders') os.makedirs(out_path, exist_ok=True) os.makedirs(render_path, exist_ok=True) dir_frames = sorted(glob.glob(os.path.join(dir, '*.png'))) - print(dir_frames) + # print(dir_frames) frames = [] for f in dir_frames: @@ -70,7 +70,7 @@ def process_dir(dir): Image.fromarray(np.around(out_H[0,0]*255).astype(np.uint8)).save('{}/frame_{:05d}.png'.format(out_path, i+1)) - if not args.no_mov: + if args.mov_from_dirs: subprocess.call([ 'ffmpeg', '-hide_banner', |