From f3771f1b565310fe39dba4d67c6455e59187d951 Mon Sep 17 00:00:00 2001 From: j Date: Mon, 16 Aug 2021 18:26:09 +0200 Subject: [PATCH 1/2] fix multiline mode --- oxtimelines/timeline.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/oxtimelines/timeline.py b/oxtimelines/timeline.py index 250c001..5cef458 100644 --- a/oxtimelines/timeline.py +++ b/oxtimelines/timeline.py @@ -44,10 +44,9 @@ class Timelines(): self.render_slitscan = 'slitscan' in modes if 'multiline' in modes: info = ox.avinfo(video_files[0]) - self.render_multiline = info['video'][0]['width'] self.output_h = sizes[0] sizes = [info['video'][0]['height']] + sizes[1:] - self.render_multiline = True + self.render_multiline = info['video'][0]['width'] self._pool = ThreadPool(multiprocessing.cpu_count()) else: self.render_multiline = False @@ -460,7 +459,7 @@ class Timelines(): self.tile_path, line, 'slitscan', self.output_h, index, type ) 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] if self.output_h != self.large_tile_image[mode][line].size[0]: img = img.resize((width, self.output_h), Image.BICUBIC) From 657a1dd2341858296bdf6447ce166e6927937c3a Mon Sep 17 00:00:00 2001 From: j Date: Sun, 21 Nov 2021 23:17:34 +0100 Subject: [PATCH 2/2] only use ffmpeg --- oxtimelines/ffmpeg.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/oxtimelines/ffmpeg.py b/oxtimelines/ffmpeg.py index 3a0fac2..c01515a 100644 --- a/oxtimelines/ffmpeg.py +++ b/oxtimelines/ffmpeg.py @@ -13,14 +13,7 @@ import numpy as np import ox -FFMPEG = None -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") +FFMPEG = 'ffmpeg' FPS = 25 class Video(object):