added some testing for video assembly

Author: jackyarndley

.gitignore

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

default.toml

@@ -1,6 +1,7 @@
 image_width = 1920
 image_height = 1080
-frames = 50
-export = "kfb"
+frames = 9999
+export = "colour"
 rotate = 0
-glitch_tolerance = 0.000001
+glitch_tolerance = 0.000001
+approximation_order = "32"

segments.txt

@@ -0,0 +1,79 @@
+file 'segment_00000078.mp4'
+file 'segment_00000077.mp4'
+file 'segment_00000076.mp4'
+file 'segment_00000075.mp4'
+file 'segment_00000074.mp4'
+file 'segment_00000073.mp4'
+file 'segment_00000072.mp4'
+file 'segment_00000071.mp4'
+file 'segment_00000070.mp4'
+file 'segment_00000069.mp4'
+file 'segment_00000068.mp4'
+file 'segment_00000067.mp4'
+file 'segment_00000066.mp4'
+file 'segment_00000065.mp4'
+file 'segment_00000064.mp4'
+file 'segment_00000063.mp4'
+file 'segment_00000062.mp4'
+file 'segment_00000061.mp4'
+file 'segment_00000060.mp4'
+file 'segment_00000059.mp4'
+file 'segment_00000058.mp4'
+file 'segment_00000057.mp4'
+file 'segment_00000056.mp4'
+file 'segment_00000055.mp4'
+file 'segment_00000054.mp4'
+file 'segment_00000053.mp4'
+file 'segment_00000052.mp4'
+file 'segment_00000051.mp4'
+file 'segment_00000050.mp4'
+file 'segment_00000049.mp4'
+file 'segment_00000048.mp4'
+file 'segment_00000047.mp4'
+file 'segment_00000046.mp4'
+file 'segment_00000045.mp4'
+file 'segment_00000044.mp4'
+file 'segment_00000043.mp4'
+file 'segment_00000042.mp4'
+file 'segment_00000041.mp4'
+file 'segment_00000040.mp4'
+file 'segment_00000039.mp4'
+file 'segment_00000038.mp4'
+file 'segment_00000037.mp4'
+file 'segment_00000036.mp4'
+file 'segment_00000035.mp4'
+file 'segment_00000034.mp4'
+file 'segment_00000033.mp4'
+file 'segment_00000032.mp4'
+file 'segment_00000031.mp4'
+file 'segment_00000030.mp4'
+file 'segment_00000029.mp4'
+file 'segment_00000028.mp4'
+file 'segment_00000027.mp4'
+file 'segment_00000026.mp4'
+file 'segment_00000025.mp4'
+file 'segment_00000024.mp4'
+file 'segment_00000023.mp4'
+file 'segment_00000022.mp4'
+file 'segment_00000021.mp4'
+file 'segment_00000020.mp4'
+file 'segment_00000019.mp4'
+file 'segment_00000018.mp4'
+file 'segment_00000017.mp4'
+file 'segment_00000016.mp4'
+file 'segment_00000015.mp4'
+file 'segment_00000014.mp4'
+file 'segment_00000013.mp4'
+file 'segment_00000012.mp4'
+file 'segment_00000011.mp4'
+file 'segment_00000010.mp4'
+file 'segment_00000009.mp4'
+file 'segment_00000008.mp4'
+file 'segment_00000007.mp4'
+file 'segment_00000006.mp4'
+file 'segment_00000005.mp4'
+file 'segment_00000004.mp4'
+file 'segment_00000003.mp4'
+file 'segment_00000002.mp4'
+file 'segment_00000001.mp4'
+file 'segment_00000000.mp4'

src/util/data_export.rs

@@ -190,7 +190,7 @@ impl DataExport {
     }
 
     fn save_colour(&mut self, filename: &str) {
-        image::save_buffer(filename.to_owned() + ".jpg", &self.rgb, self.image_width as u32, self.image_height as u32, image::ColorType::Rgb8).unwrap();
+        image::save_buffer(filename.to_owned() + ".png", &self.rgb, self.image_width as u32, self.image_height as u32, image::ColorType::Rgb8).unwrap();
     }
 
     fn save_raw(&mut self, filename: &str) {
@@ -211,27 +211,20 @@ impl DataExport {
 
         file.write_all(b"KFB").unwrap();
 
-        let test1 = [self.image_width as u32];
-        let test2 = [self.image_height as u32];
-
-        // iteration division??
-        let test3 = [1u32];
+        let test1 = [self.image_width as u32, self.image_height as u32];
 
         // Colours in colourmap
         let test5 = DataExport::generate_colour_palette();
 
-        // Number of colours in colourmap
-        let test4 = [test5.len() as u32];
+        // iteration division??
+        let test3 = [1u32, test5.len() as u32];
 
         // Maxmimum iteration
         let test6 = [maximum_iteration as u32];
 
         file.write_all(unsafe {
             slice::from_raw_parts(test1.as_ptr() as *const u8, 4)
         }).unwrap();
-        file.write_all(unsafe {
-            slice::from_raw_parts(test2.as_ptr() as *const u8, 4)
-        }).unwrap();
 
         file.write_all(unsafe {
             slice::from_raw_parts(self.iterations.as_ptr() as *const u8, self.iterations.len() * 4)
@@ -241,10 +234,6 @@ impl DataExport {
             slice::from_raw_parts(test3.as_ptr() as *const u8, 4)
         }).unwrap();
 
-        file.write_all(unsafe {
-            slice::from_raw_parts(test4.as_ptr() as *const u8, 4)
-        }).unwrap();
-
         file.write_all(unsafe {
             slice::from_raw_parts(test5.as_ptr() as *const u8, 3 * test5.len())
         }).unwrap();

test.py

@@ -0,0 +1,3 @@
+import os
+
+os.system("ffmpeg -y -f concat -safe 0 -i segments.txt -c copy output.mp4")

test2.py

@@ -0,0 +1,86 @@
+import imageio
+import numpy as np
+import time
+import os
+
+from PIL import Image
+
+frames_between_keyframes = 60
+maximum_keyframe_number = 783
+zoom_scale = 2
+
+# Arguments for ffmpeg
+kargs = {
+    'macro_block_size': 8,
+    'fps': 60,
+    'format': 'FFMPEG',
+    'quality': 5
+}
+
+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")
+
+# We start with the previous image, this is modified
+previous_keyframe = Image.open(f"output/output_00000000.png")
+
+(width, height) = (previous_keyframe.width, previous_keyframe.height)
+(scaled_width, scaled_height) = (zoom_scale * width, zoom_scale * height)
+placement_box = (scaled_width//4, scaled_height//4, scaled_width//4 * 3, scaled_height//4 * 3)
+
+for i in range(0, maximum_keyframe_number):
+    # Creates 10 second segments
+    if (i * frames_between_keyframes) % 600 == 0 and i != 0:
+        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(f"output/output_{i + 1:08}.png")
+
+    scaled_keyframe = next_keyframe.resize((scaled_width, scaled_height), resample=Image.LANCZOS)
+    
+    scaled_keyframe.paste(previous_keyframe, placement_box)
+
+    for j in range(0, frames_between_keyframes):
+        zoom = zoom_scale**(1.0 - j / frames_between_keyframes)
+
+        temp1 = (1.0 - 1.0 / zoom) * width
+        temp2 = (1.0 - 1.0 / zoom) * height
+        temp3 = scaled_width - temp1
+        temp4 = scaled_height - temp2
+
+        next_frame = scaled_keyframe.crop((temp1, temp2, temp3, temp4)).resize((width, height), resample=Image.HAMMING)
+
+        framebuffer.append(np.array(next_frame))
+        print(f"{i * frames_between_keyframes + j + 1}/{maximum_keyframe_number * frames_between_keyframes + 1} {time.time() - t0:.2f}s")
+
+    previous_keyframe = scaled_keyframe.resize((width, height), resample=Image.LANCZOS)
+
+
+framebuffer.append(np.array(previous_keyframe))
+
+print(f"{maximum_keyframe_number * frames_between_keyframes + 1}/{maximum_keyframe_number * frames_between_keyframes + 1} {time.time() - t0:.2f}s")
+
+for frame in reversed(framebuffer):
+    writer.append_data(frame)
+
+# Command to split up into 
+# ffmpeg -i invid.mp4 -threads 3 -vcodec copy -f segment -segment_time 2 cam_out_h264%04d.mp4
+
+with open('segments.txt', 'w') as f:
+    for segment in reversed(segment_names):
+        f.write(f"file '{segment}'\n")
+
+writer.close()
+
+os.system("ffmpeg -y -f concat -safe 0 -i segments.txt -c copy output.mp4")