Add files via upload

Author: Akascape

Python Version/Assets/version/VERSIONPY.txt

@@ -1 +1 @@
-1.8
+1.9

Python Version/DatamoshLib/FFG_effects/basic_modes.py

@@ -3,10 +3,10 @@
 from pathlib import Path
 import numpy as np
 DIRPATH = Path(os.path.dirname(os.path.realpath(__file__)))
-ffgac=str(DIRPATH.parent.parent).replace(os.sep, '/')+"/FFglitch/ffgac"
-ffedit=str(DIRPATH.parent.parent).replace(os.sep, '/')+"/FFglitch/ffedit"
+ffgac = str(DIRPATH.parent.parent).replace(os.sep, '/')+"/FFglitch/ffgac"
+ffedit = str(DIRPATH.parent.parent).replace(os.sep, '/')+"/FFglitch/ffedit"
 
-def library(input_video, output, mode, extract_from="", fluidity=0, size=0, s=0, e=0, vh=0, gop=1000):
+def library(input_video, output, mode, extract_from="", fluidity=0, size=0, s=0, e=0, vh=0, gop=1000, r=0, f=0):
         def get_vectors(input_video):
             subprocess.call(f'"{ffgac}" -i "{input_video}" -an -mpv_flags +nopimb+forcemv -qscale:v 0 -g "{gop}"' +
                             ' -vcodec mpeg2video -f rawvideo -y tmp.mpg', shell=True)
@@ -118,6 +118,34 @@ def rise(output):
                   fp.write(out_data)
                   fp.close()
             shutil.rmtree("cache")
+        def water_bloom(output):
+            if os.path.isdir("cache"):
+                shutil.rmtree("cache")
+            os.mkdir("cache")
+            base=os.path.basename(input_video)
+            fin="cache/"+base[:-4]+".mpg"
+            qua=''
+            subprocess.call(f'"{ffgac}" -i "{input_video}" -an -vcodec mpeg2video -f rawvideo -mpv_flags +nopimb -qscale:v 6 -r 30 -g "{gop}" -y "{fin}"')
+            os.mkdir("cache/raws")
+            framelist=[]
+            subprocess.call(f'"{ffgac}" -i "{fin}" -vcodec copy cache/raws/frames_%04d.raw')
+            repeat=r
+            po=f-1
+            frames=os.listdir("cache/raws")
+            for i in frames[:po]:
+                    framelist.append(i)
+            for i in range(repeat):
+                    framelist.append(frames[po])
+            for i in frames[po:]:
+                    framelist.append(i)
+            out_data = b''
+            for fn in framelist:
+               with open("cache/raws/"+fn, 'rb') as fp:
+                   out_data += fp.read()
+            with open(output, 'wb') as fp:
+                  fp.write(out_data)
+                  fp.close()
+            shutil.rmtree("cache")
         def average(frames):
             if not frames:
                 return []
@@ -152,3 +180,5 @@ def movement(frames):
             shuffle(output)
         elif(mode==5):
             rise(output)
+        elif(mode==6):
+            water_bloom(output)

Python Version/DatamoshLib/FFG_effects/external_script.py

@@ -2,13 +2,14 @@
 import os, subprocess
 from pathlib import Path
 DIRPATH = Path(os.path.dirname(os.path.realpath(__file__)))
-ffgac=str(DIRPATH.parent.parent).replace(os.sep, '/')+"/FFglitch/ffgac"
-ffedit=str(DIRPATH.parent.parent).replace(os.sep, '/')+"/FFglitch/ffedit"
+ffgac = str(DIRPATH.parent.parent).replace(os.sep, '/')+"/FFglitch/ffgac"
+ffedit = str(DIRPATH.parent.parent).replace(os.sep, '/')+"/FFglitch/ffedit"
+
 def mosh(input_video, output_video, mode, effect='', scriptfile='', gop=1000):
     if mode==1:
         script_path=scriptfile
     elif mode==2:
-        script_path=str(DIRPATH).replace(os.sep, '/')+"/jscripts/"+effect+".js"
+        script_path = str(DIRPATH).replace(os.sep, '/')+"/jscripts/"+effect+".js"
     subprocess.call(f'"{ffgac}" -i "{input_video}" -an -mpv_flags +nopimb+forcemv -qscale:v 0  -b:v 20M -minrate 20M -maxrate 20M -bufsize 2M -g "{gop}"' +
                         ' -vcodec mpeg2video -f rawvideo -y tmp.mpg', shell=True)
     subprocess.call(f'"{ffedit}" -i tmp.mpg -f mv -s "{script_path}" -o "{output_video}"', shell=True)

Python Version/DatamoshLib/Tomato/tomato.py

@@ -23,6 +23,7 @@ def mosh(infile, outfile, m, c, n, a, f, k):
         audio = a
         firstframe = f
         kill = k
+
         if filein is None or os.path.exists(filein) == False:
                 print("> step 0/5: valid input file required!")
                 print("use -h to see help")
@@ -125,15 +126,33 @@ def bstream_until_marker(bfilein, bfileout, marker=0, startpos=0):
 
         # keep first video frame or not
         if firstframe:
+                if mode == "bloom":
+                        if positframes==1:
+                                positframes=2
+                        for x in l[0:positframes]:
+                                if x[2] == 'video':
+                                        clean.append(x)
+                        # clean the list by killing "big" frames
+                        for x in l[positframes:]:
+                                if x[1] <= (max_frame_size * kill) :
+                                        clean.append(x)
+                else:
+                        for x in l[0:10]:
+                                if x[2] == 'video':
+                                        clean.append(x)
+                        # clean the list by killing "big" frames
+                        for x in l[10:]:
+                                if x[1] <= (max_frame_size * kill) :
+                                        clean.append(x)
+        else:
                 for x in l:
                         if x[2] == 'video':
                                 clean.append(x)
                                 break
-
-        # clean the list by killing "big" frames
-        for x in l:
-                if x[1] <= (max_frame_size * kill) :
-                        clean.append(x)
+                # clean the list by killing "big" frames
+                for x in l:
+                        if x[1] <= (max_frame_size * kill) :
+                                clean.append(x)
         # FX modes
         if mode == "void":
                 print('> step 3/5 : mode void')