Merge pull request #21 from jackyarndley/development

Development

Author: jackyarndley

.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+rustflags = "-C target-cpu=native"

.gitignore

@@ -5,4 +5,6 @@
 *.svg
 *.data
 *.old
-/output
+/output
+/.vscode
+*.mp4

Cargo.lock

@@ -1,19 +1,20 @@
 [package]
 name = "rust_fractal"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["jackyarndley <34801340+jackyarndley@users.noreply.github.com>"]
 description = "Fast, efficient mandelbrot set renderer."
 edition = "2018"
 
 [dependencies]
-image = "0.23.6"
+image = "^0.23.6"
 rand = "^0.7.3"
 num-complex = "^0.2.4"
-rayon = "1.3.1"
+rayon = "^1.3.1"
 exr = "^0.8.0"
 smallvec = "^1.4.2"
 clap = "3.0.0-beta.1"
 config = "0.9"
+half = "^1.6.0"
 
 [dependencies.rug]
 version = "1.10"
@@ -22,6 +23,7 @@ features = ["float", "complex"]
 
 #Additional commands that can improve performance (maybe by around 5-10%)
 [profile.release]
-#lto = "fat"
-#codegen-units = 1
+lto = "fat"
+codegen-units = 1
 #debug = true
+opt-level=3

Cargo.toml

@@ -0,0 +1,109 @@
+import imageio
+import numpy as np
+import time
+import os
+import math
+import glob
+
+from PIL import Image
+
+frames_between_keyframes = 60
+maximum_keyframe_number = 728
+zoom_scale = 2.0
+
+# log1.1 of 2 is 7.27
+# 60 / that is 8.25, so lets take 8 frames per keyframe
+
+# Arguments for ffmpeg
+kargs = {
+    'macro_block_size': 8,
+    'fps': 60,
+    'format': 'FFMPEG',
+    'quality': 8
+}
+
+t0 = time.time()
+
+segment = 0
+segment_names = []
+
+framebuffer = []
+
+writer = imageio.get_writer(f"segment_{segment:08}.mp4", **kargs)
+segment_names.append(f"segment_{segment:08}.mp4")
+
+files = glob.glob("output/*.png")
+files.sort()
+
+# We start with the previous image, this is modified
+previous_keyframe = Image.open(files[0])
+
+(width, height) = (previous_keyframe.width, previous_keyframe.height)
+(scaled_width, scaled_height) = (int(zoom_scale * width), int(zoom_scale * height))
+
+val1 = (scaled_width - width) // 2
+val2 = (scaled_height - height) // 2
+
+placement_box = (val1, val2, val1 + width, val2 + height)
+
+for i in range(0, maximum_keyframe_number):
+    # Creates 10 second segments
+    if (i * frames_between_keyframes) % 600 == 0 and i != 0:
+        # Add current_framebuffer frames
+        for frame in reversed(framebuffer):
+            writer.append_data(frame)
+        
+        segment += 1
+
+        framebuffer = []
+
+        # Writer for adding frames to the video
+        writer = imageio.get_writer(f"segment_{segment:08}.mp4", **kargs)
+        segment_names.append(f"segment_{segment:08}.mp4")
+
+    next_keyframe = Image.open(files[i + 1])
+
+    # This has to be nearest
+    scaled_keyframe = next_keyframe.resize((scaled_width, scaled_height), resample=Image.NEAREST)
+    
+    scaled_keyframe.paste(previous_keyframe, placement_box)
+
+    current_scale = zoom_scale
+    factor = 10**(math.log10(zoom_scale) / frames_between_keyframes)
+
+    for j in range(0, frames_between_keyframes):
+        # zoom = 1.0 + (2**(1.0 - j / frames_between_keyframes) - 1.0) * (zoom_scale - 1.0)
+        # zoom = zoom_scale**(1.0 - j / frames_between_keyframes)
+        # zoom = zoom_scale**((1.0 - j / frames_between_keyframes))
+        current_scale /= factor
+
+        temp1 = (1.0 - 1.0 / current_scale) * (scaled_width // 2)
+        temp2 = (1.0 - 1.0 / current_scale) * (scaled_height // 2)
+        temp3 = scaled_width - temp1
+        temp4 = scaled_height - temp2
+
+        next_frame = scaled_keyframe.crop((temp1, temp2, temp3, temp4)).resize((width, height), resample=Image.LANCZOS)
+
+        framebuffer.append(np.array(next_frame))
+
+        elapsed = time.time() - t0
+        print(f"{i * frames_between_keyframes + j + 1}/{maximum_keyframe_number * frames_between_keyframes + 1} {elapsed:.2f}s {((i * frames_between_keyframes + j + 1)/elapsed):.2f} fps")
+
+    previous_keyframe = scaled_keyframe.resize((width, height), resample=Image.LANCZOS)
+
+
+framebuffer.append(np.array(previous_keyframe))
+
+for frame in reversed(framebuffer):
+    writer.append_data(frame)
+
+with open('segments.txt', 'w') as f:
+    for segment in reversed(segment_names):
+        f.write(f"file '{segment}'\n")
+
+writer.close()
+
+elapsed = time.time() - t0
+print(f"{maximum_keyframe_number * frames_between_keyframes + 1}/{maximum_keyframe_number * frames_between_keyframes + 1} {elapsed:.2f}s {((maximum_keyframe_number * frames_between_keyframes + 1)/elapsed):.2f} fps")
+
+os.system("ffmpeg -y -f concat -safe 0 -i segments.txt -c copy output.mp4")

TODO.md

@@ -1,6 +1,7 @@
-image_width = 1920
-image_height = 1080
-frames = 50
-export = "kfb"
-rotate = 0
-glitch_tolerance = 0.000001
+image_width = 1000
+image_height = 1000
+frames = 1
+export = "both"
+glitch_tolerance = 0.000001
+zoom_scale = 2.0
+auto_adjust_iterations = true

assemble_video.py

@@ -0,0 +1,4 @@
+real = "-1.7891690186048231066744683411888387638173618368159070155822017397181006156270275749142369245820396054406395755675312183271534128923049471434097690222315419202715383264050159131947029173677395015878767362862533310902938210320999999999999999999999999999999998"
+imag = "-0.0000003393685157671825660282302661468127283482188945938569013974696942388736569110136147219176174266842972236468548795141989046122450230790250469659063534132826324119846599278074403635939133245821264547306595273202030703232999999999999999999999999999999998"
+zoom = "1.41200697933E219"
+iterations = 200000