summaryrefslogtreecommitdiff
path: root/run.py
diff options
context:
space:
mode:
Diffstat (limited to 'run.py')
-rw-r--r--run.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/run.py b/run.py
index e030a07..a043607 100644
--- a/run.py
+++ b/run.py
@@ -57,7 +57,6 @@ tensorOutput = torch.FloatTensor()
index = 0
def recurse_two_frames(moduleNetwork, tensorOutput, a_np, b_np, frame_index, morph_index, step, depth=0):
- step /= 2
print("generate {} {} {}".format(frame_index, morph_index, step))
tensorInputFirst = torch.FloatTensor(a_np)
@@ -70,14 +69,14 @@ def recurse_two_frames(moduleNetwork, tensorOutput, a_np, b_np, frame_index, mor
middle_img = (numpy.rollaxis(middle_np, 0, 3)[:,:,::-1] * 255.0).astype(numpy.uint8)
return middle_img
if morph_index > frame_index:
- next_index = frame_index - (step/2)
+ next_index = frame_index - (step/4)
next_a_np = a_np
next_b_np = middle_np
else:
- next_index = frame_index + (step/2)
+ next_index = frame_index + (step/4)
next_a_np = middle_np
next_b_np = b_np
- return recurse_two_frames(moduleNetwork, tensorOutput, next_a_np, next_b_np, frame_index, next_index, step, depth+1)
+ return recurse_two_frames(moduleNetwork, tensorOutput, next_a_np, next_b_np, frame_index, next_index, step/2, depth+1)
def recurse_videos(moduleNetwork, tensorOutput, a, b, a_offset, b_offset, count, step, frame_index):
global index
@@ -90,7 +89,7 @@ def recurse_videos(moduleNetwork, tensorOutput, a, b, a_offset, b_offset, count,
print("{} => {}".format(a_fn, b_fn))
a_np = load_image(a_fn)
b_np = load_image(b_fn)
- frame = recurse_two_frames(moduleNetwork, tensorOutput, a_np, b_np, frame_index, count / 2, count / 4)
+ frame = recurse_two_frames(moduleNetwork, tensorOutput, a_np, b_np, frame_index, count / 2, count / 2)
if step < 2:
return [frame]
else: