0x2620/oxtimelines
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:b9ac80398ce9bc1ad61b4ecd2524f39daccf78b0
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:657a1dd2341858296bdf6447ce166e6927937c3a
Branches Tags
0x2620:master
0x2620:stable

2 commits
b9ac80398c ... 657a1dd234

Author SHA1 Message Date
j
657a1dd234 only use ffmpeg 2021-11-21 23:17:34 +01:00
j
f3771f1b56 fix multiline mode 2021-08-16 18:26:09 +02:00
2 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
oxtimelines/ffmpeg.py
View file

@ -13,14 +13,7 @@ import numpy as np
import ox import ox
FFMPEG = None FFMPEG = 'ffmpeg'
for cmd in ('ffmpeg', 'avconv'):
cmd = ox.file.cmd(cmd)
if subprocess.call(['which', cmd], stdout=subprocess.PIPE) == 0:
FFMPEG = cmd
break
if not FFMPEG:
print("could not find ffmpeg, make sure its installed and available in PATH")
FPS = 25 FPS = 25
class Video(object): class Video(object):

5
oxtimelines/timeline.py
View file

@ -44,10 +44,9 @@ class Timelines():
self.render_slitscan = 'slitscan' in modes self.render_slitscan = 'slitscan' in modes
if 'multiline' in modes: if 'multiline' in modes:
info = ox.avinfo(video_files[0]) info = ox.avinfo(video_files[0])
self.render_multiline = info['video'][0]['width']
self.output_h = sizes[0] self.output_h = sizes[0]
sizes = [info['video'][0]['height']] + sizes[1:] sizes = [info['video'][0]['height']] + sizes[1:]
self.render_multiline = True self.render_multiline = info['video'][0]['width']
self._pool = ThreadPool(multiprocessing.cpu_count()) self._pool = ThreadPool(multiprocessing.cpu_count())
else: else:
self.render_multiline = False self.render_multiline = False
@ -460,7 +459,7 @@ class Timelines():
self.tile_path, line, 'slitscan', self.output_h, index, type self.tile_path, line, 'slitscan', self.output_h, index, type
) )
ox.makedirs(os.path.dirname(tile_file)) ox.makedirs(os.path.dirname(tile_file))
width = self.large_tile_image[mode][line].size[1] width = self.large_tile_image[mode][line].size[0]
img = self.large_tile_image[mode][line] img = self.large_tile_image[mode][line]
if self.output_h != self.large_tile_image[mode][line].size[0]: if self.output_h != self.large_tile_image[mode][line].size[0]:
img = img.resize((width, self.output_h), Image.BICUBIC) img = img.resize((width, self.output_h), Image.BICUBIC)